[SCM] kdelibs4support packaging branch, master, updated. c1bcf33dd39e476c1d374642748ce566bf2ba2ed

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e19ca0152572eebd1baa9b1af00f9c433b4b4ee8
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jan 28 15:01:01 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

-- 
kdelibs4support packaging