[SCM] rekonq packaging branch, master, updated. ff1779f3df919e326d908879f3ba18b1b63b103f

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 97a7a123d3619b8f842db6dcccd6aa9e06a10a02
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri May 27 13:54:33 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

-- 
rekonq packaging