[SCM] kdeedu-data packaging branch, master, updated. fd7aeb5ca24dfc673a82fbc438d0a7532a3a2652

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdeedu-data.git;a=commitdiff;h=a5c108c

The following commit has been merged in the master branch:
commit a5c108cc8c063024ea72292dd8e4e55559b00092
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Feb 19 10:55: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

-- 
kdeedu-data packaging