[SCM] knights packaging branch, master, updated. upstream/2.3.1-37-g90a1d2a

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 2a1a469ff62f2b1f03a110b378cec8f51184e647
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri May 27 14:21:36 2011 +0200

    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

-- 
knights packaging