[SCM] kitemmodels packaging branch, master, updated. 87c8a4aedcc60609ee118f8ff808f4f7d32791ec

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0dc2c9c868115d107669c370a6b73629c4c334c9
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jan 23 14:34:20 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

-- 
kitemmodels packaging