[SCM] kcalcore packaging branch, master, updated. debian/15.12.0-1-16-g56d406f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kcalcore.git;a=commitdiff;h=0c8df06

The following commit has been merged in the master branch:
commit 0c8df06b1f163f59fb6270cf587b659de545db24
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Thu Apr 21 06:33:13 2016 +0200

    Add a .gitattributes file to use dpkg-mergechangelogs
---
 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

-- 
kcalcore packaging