[SCM] baloo-widgets packaging branch, master, updated. debian/15.08.0-2-2-gff86c2e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/baloo-widgets.git;a=commitdiff;h=e1e5c18

The following commit has been merged in the master branch:
commit e1e5c181de17eb449bc376efac8dcfdf691c8b00
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Aug 24 04:27:18 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-widgets packaging