[SCM] kxmlrpcclient packaging branch, master, updated. 5bab2f1f8ccde311b2f75c6185d1c39f3af236b1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b34060317e57399fa36cb49bbe52adb735f82d64
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:41:32 2015 +0200

    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

-- 
kxmlrpcclient packaging