[SCM] kaffeine packaging branch, master, updated. debian/2.0.5-1-5-gdab18b1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kaffeine.git;a=commitdiff;h=7a35aab

The following commit has been merged in the master branch:
commit 7a35aab21e538278595f392910bb2604059c9ca7
Author: Pino Toscano <pino at debian.org>
Date:   Fri Sep 29 17:18:24 2017 +0200

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

-- 
kaffeine packaging