[SCM] karchive packaging branch, master, updated. debian/5.11.0-1-5-gee941ab

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 237cf43ad0bf095a48f34a4838732a37b3a3e0c1
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jan 21 12:21:42 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

-- 
karchive packaging