[SCM] KTorrent library Debian packaging branch, master, updated. debian/2.1-2

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libktorrent.git;a=commitdiff;h=323c004

The following commit has been merged in the master branch:
commit 323c004bf66fb4f92f99b68e16a1539fcef2bcd0
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 5 20:01:59 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

-- 
KTorrent library Debian packaging