[SCM] systemsettings packaging branch, master, updated. b74160ba3290bff60feee05bc82b6e6a16f60c44

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/systemsettings.git;a=commitdiff;h=16bc1b2

The following commit has been merged in the master branch:
commit 16bc1b29bdee03243061104eb4496d3e10fdc80c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 13 10:14:57 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

-- 
systemsettings packaging