[SCM] kio-extras packaging branch, master, updated. 04581bb899d36c8a560536b19685772a26a5b83f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e82b8701848d060d01e962b6fbde4b87faec4b32
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Feb 10 16:58:13 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

-- 
kio-extras packaging