[SCM] kinfocenter packaging branch, master, updated. 369fc5cb173cfde7592e3523e2b227e356f01c1d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kinfocenter.git;a=commitdiff;h=4a2765b

The following commit has been merged in the master branch:
commit 4a2765b82e13b5c755cf9a9d8ab6a3a0c5e8df4e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Feb 10 18:08:13 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

-- 
kinfocenter packaging