[SCM] kpty packaging branch, master, updated. 22db0c11dd3d36327772dfae78783a019d77b7b3

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b06ba4ca426cf4a80f0f10ac3beb6ee44971dbed
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Jan 25 08:57: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

-- 
kpty packaging