[SCM] kinit packaging branch, master, updated. d01a5a8bd9940c33d6f97d403f2f5a0b37e27ae4

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kinit.git;a=commitdiff;h=8620dc5

The following commit has been merged in the master branch:
commit 8620dc599d97c9c95595b78429063ffe62ebeb64
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jan 27 16:22:04 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

-- 
kinit packaging