[SCM] baloo packaging branch, master, updated. ubuntu/5.13.0-0ubuntu1-90-g484cab4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 9bebd61a2fb33fd256497a7f5c3e6cd6dd43d6ef
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Aug 23 17:52:04 2014 +0200

    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