[SCM] libkipi packaging branch, master, updated. 33434ee7f1e86aa2630d1db73182955712ecb7ec

[Pino Toscano]

The following commit has been merged in the master branch:
commit 33434ee7f1e86aa2630d1db73182955712ecb7ec
Author: Pino Toscano <pino at debian.org>
Date:   Sun Nov 20 00:46:11 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

-- 
libkipi packaging