[SCM] ktexteditor packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-g964e294

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 787bff21067b5e217fca2f97e2fe3ea472895b90
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jan 28 11:01:36 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

-- 
ktexteditor packaging