[SCM] knewstuff packaging branch, master, updated. 2eca235ef0054bca3e7c41d71c506088515710f8

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6f83d141de2534dce49259ad07c6c27cdd5f17e3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jan 28 09:08:19 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

-- 
knewstuff packaging