[SCM] libaccounts-glib packaging branch, master, updated. debian/1.18+20150112-2-9-g5c55c94

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libaccounts-glib.git;a=commitdiff;h=c7a4841

The following commit has been merged in the master branch:
commit c7a48417b5510fbe759ccecc84239b103e54565f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Apr 26 10:35:58 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

-- 
libaccounts-glib packaging