[SCM] kdbusaddons packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g50bd3e0

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 46d80a0f3f19cc03bd074259e6cc548881b6e6d7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jan 22 20:27:39 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

-- 
kdbusaddons packaging