[SCM] kcoreaddons packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-gda1a01d

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 7f8bb1794c779338c156f84ecb46abbb43f5cda9
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jan 21 21:57:46 2015 +0100

    Add merge changelog attributes
---
 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

-- 
kcoreaddons packaging