[SCM] kactivities packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g47a9b5a

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 48790ca1fb4c22637e3a89c0d768a60c325b9089
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Jan 26 15:25: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

-- 
kactivities packaging