[SCM] ktextwidgets packaging branch, master, updated. 1ef469cb331e3832512a23dbd517d197b0ef3bf1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 79baa40b6954a4ceaf172e3018f9d7b9df6fb2b8
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jan 27 13:39:18 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

-- 
ktextwidgets packaging