[SCM] ktp-accounts-kcm packaging branch, master, updated. ubuntu/4%15.08.0-0ubuntu1-10-g7fdc04b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=2ce102d

The following commit has been merged in the master branch:
commit 2ce102d1ff894e0c852abee4f569eac71cd85554
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Sep 4 19:26:20 2015 +0200

    Add gitattributes to merge changelog with dpkg-mergechangelog
---
 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

-- 
ktp-accounts-kcm packaging