[SCM] kdesu packaging branch, master, updated. cb013a34cf1d9f6bae985801b73b43e56c949df6

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdesu.git;a=commitdiff;h=b2a442d

The following commit has been merged in the master branch:
commit b2a442dae6a5e0d4520d5b3d6643afac8b1a1b58
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jan 28 08:45:11 2015 +0100

    Add gitattributes to merge changelog with dpkg-mergechangelog
---
 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

-- 
kdesu packaging