[SCM] khangman packaging branch, master, updated. edbe9a4b9696f362fe4962222aea3cc87215a2d5

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 9892b0fc97451b85a29af10f5d45c219a53317b4
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Nov 16 08:52:44 2011 +0100

    Add abort-on-upstream-changes to local-options.
---
 debian/source/local-options |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes

-- 
khangman packaging