[SCM] kldap packaging branch, master, updated. debian/15.08.1-1-17-g92023f6

[Maximiliano Curia]

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

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

-- 
kldap packaging