[SCM] kollision packaging branch, master, updated. debian/14.12.2-1-1-g33b99e5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kollision.git;a=commitdiff;h=33b99e5

The following commit has been merged in the master branch:
commit 33b99e57f9d5593bc8621bafd0455387a773653e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 14:37: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

-- 
kollision packaging