[SCM] kdeplasma-addons packaging branch, master, updated. 6d52ae6714a545f62920fd83ce0eada568dd163b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kdeplasma-addons.git;a=commitdiff;h=33d1318

The following commit has been merged in the master branch:
commit 33d131881246913cfc837dba1d68686919fe81c8
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 9 09:23:45 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

-- 
kdeplasma-addons packaging