[SCM] kamoso packaging branch, master, updated. debian/3.2.1-1-9-g014c136

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kamoso.git;a=commitdiff;h=014c136

The following commit has been merged in the master branch:
commit 014c136d864bf5508ee9c80dc1f731ce529cd738
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jun 19 21:46:18 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

-- 
kamoso packaging