[SCM] akonadi-search packaging branch, master, updated. debian/15.12.1-1-18-g2856d70

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi-search.git;a=commitdiff;h=9eae83c

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

-- 
akonadi-search packaging