[SCM] kio packaging branch, master, updated. 17a04a2aad26a68df70fa84e06d600825914ee87

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 71ac46d22b62763ca68fb6f3e9c06114b50f86ef
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Jan 26 14:51:03 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

-- 
kio packaging