[SCM] baloo packaging branch, master, updated. debian/5.19.0-1-21-g8c4937d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/baloo.git;a=commitdiff;h=286ac85

The following commit has been merged in the master branch:
commit 286ac85db5f2c9de03567325d91ff3c16c32c6b6
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Apr 18 19:10:31 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

-- 
baloo packaging