[SCM] kactivities packaging branch, master, updated. debian/5.12.0-1-238-g47d060f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kactivities.git;a=commitdiff;h=fec04c1

The following commit has been merged in the master branch:
commit fec04c1a722c1dec01ca42eb9cc67f0422744921
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jan 10 23:56:19 2012 +0100

    add a .gitattributes file
---
 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

-- 
kactivities packaging