[SCM] kfilemetadata packaging branch, master, updated. 1dd5ba2fe36fc4e96f27425709bbc2bb29a2bdb2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kfilemetadata.git;a=commitdiff;h=e39ec6b

The following commit has been merged in the master branch:
commit e39ec6b2a44b2881506de18bf2e305dd4d86335b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 6 23:44:40 2015 +0100

    Add gitattributes to merge changelog with dpkg-mergechangelog
---
 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

-- 
kfilemetadata packaging