[SCM] ktnef packaging branch, master, updated. debian/15.12.0-2-11-g97bd1f9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktnef.git;a=commitdiff;h=15a1cfe

The following commit has been merged in the master branch:
commit 15a1cfe36088c182a9d87e4b56068156245e4a4b
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Thu Apr 21 05:15:12 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

-- 
ktnef packaging