[SCM] attica packaging branch, master, updated. debian/5.12.0-1-5-g67f5d14

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0b313d3495843eded336f5fdad6bf938d8d98031
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jul 2 23:54:41 2012 +0200

    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

-- 
attica packaging