[SCM] threadweaver packaging branch, master, updated. 4e8c5885b08b5d4e65059c3013babe76ff2d7604

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0c1c41a33d933bb4819ef649a685e3053ba90d6e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jan 23 21:44:25 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

-- 
threadweaver packaging