[SCM] kjobwidgets packaging branch, master, updated. a5e441d10f7bf65fed0415189dcffeb85202b3be

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a86135f4d7f2e0a27690783480d945cadc741bc6
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

-- 
kjobwidgets packaging