[SCM] ksysguard packaging branch, master, updated. a21064ed627097de3ea1f610718caeb27d82a3c8

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/ksysguard.git;a=commitdiff;h=19ed02f

The following commit has been merged in the master branch:
commit 19ed02fed77263fb6bc05993770db9f3a1f4243e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 9 22:02:55 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

-- 
ksysguard packaging