[SCM] kimageformats packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g2e99981

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 4f36864c07dd09cf85cbb9ebe711a78143312401
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jan 23 14:04:59 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

-- 
kimageformats packaging