[SCM] kross packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g1da5858

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit ec2b8aebd8b105aa8c021e968f2367d00743fd9d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:22:52 2015 +0200

    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

-- 
kross packaging