[SCM] frameworkintegration packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g5c43253

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit e2cb48ccb0abd056b2993baf3128939a533c165d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 6 11:49:21 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

-- 
frameworkintegration packaging