[SCM] kdesdk-kioslaves packaging branch, master, updated. debian/4.12.3-2-14-g0de4b41

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdesdk-kioslaves.git;a=commitdiff;h=4f52a0e

The following commit has been merged in the master branch:
commit 4f52a0e4b5a99e0d3338cce6c5754d9391fc624c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Feb 18 18:36:14 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

-- 
kdesdk-kioslaves packaging