[SCM] kded packaging branch, master, updated. a2214fbc0320772ced22bdf92cb0d3ed84075ba7

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0611b3f4300a131bb4162928f93a979f2de307f8
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jan 27 15:17:52 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

-- 
kded packaging