[SCM] kdoctools packaging branch, master, updated. 383030f2a78fc4ec7b0443162c59e2a782ead81c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8b14f9d58533ea593149add0e404e3256508c920
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Jan 25 08:57:56 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

-- 
kdoctools packaging