[SCM] kde-dev-utils packaging branch, master, updated. debian/4.12.2-2-17-g56e2968

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-dev-utils.git;a=commitdiff;h=8b250b5

The following commit has been merged in the master branch:
commit 8b250b5f49984a67e6ebc3445d6518e7cee13ff9
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Feb 17 15:24:56 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

-- 
kde-dev-utils packaging