[SCM] libksysguard packaging branch, master, updated. d272cc7a37e00911cd33f0c161be0cc730bfa93a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/libksysguard.git;a=commitdiff;h=694deb3

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

-- 
libksysguard packaging