[SCM] okular packaging branch, master, updated. 0912cad84842e949f1f688d03d47ebb0ef91d3e7

[Pino Toscano]

The following commit has been merged in the master branch:
commit 0912cad84842e949f1f688d03d47ebb0ef91d3e7
Author: Pino Toscano <pino at debian.org>
Date:   Sun Nov 20 00:46:17 2011 +0100

    add a .gitattributes
---
 debian/.gitattributes |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs

-- 
okular packaging