[SCM] kiten packaging branch, master, updated. debian/4.14.0-1-22-g84644c0

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kiten.git;a=commitdiff;h=7d284f2

The following commit has been merged in the master branch:
commit 7d284f2f2746d81282a6ae6785346a3696eac7a7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Feb 18 19:49:59 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

-- 
kiten packaging