[SCM] Calligra suite packaging branch, master, updated. debian/2.9.11+dfsg-4-14-g0be31c3

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 0be31c3ddf246e8993decf1412bc26767306056b
Author: Pino Toscano <pino at debian.org>
Date:   Sat Aug 19 13:09:49 2017 +0200

    add a .gitattributes file
---
 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

-- 
Calligra suite packaging