[SCM] qtpim packaging branch, master, updated. 2352393821c49da2e750dbb3bf4c1b7f019d95d7

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtpim.git;a=commitdiff;h=2cb9ccc

The following commit has been merged in the master branch:
commit 2cb9ccc220b95ea2319ea95b824268b49fe3ef6b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Jun 13 12:32:29 2013 +0300

    add .gitattributes
---
 debian/.gitattributes |    1 +
 1 file changed, 1 insertion(+)

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

-- 
qtpim packaging