[SCM] kglobalaccel packaging branch, master, updated. 655ccc8dad2b3ac288a05155270af0264afb618d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kglobalaccel.git;a=commitdiff;h=95ba2ac

The following commit has been merged in the master branch:
commit 95ba2ac3131daa071041e01d354c01a5d55a4241
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jan 27 08:48:56 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

-- 
kglobalaccel packaging