[SCM] kconfig packaging branch, master, updated. 11b1b0d60213c15d5996cb2b99a6cc142e269dd3

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 07986f3c0fe33db48f69f2e073c6fc2ab071f55a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jan 22 20:17:44 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

-- 
kconfig packaging