[SCM] qtimageformats packaging branch, master, updated. ac2575b02b261cd24c44b91e4cff7af5281ed21e

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtimageformats.git;a=commitdiff;h=8917146

The following commit has been merged in the master branch:
commit 89171461c812f3210cc8b32f5501a2c987f3f7f8
Author: Pino Toscano <pino at debian.org>
Date:   Wed May 1 20:37:46 2013 +0200

    add a .gitattributes
---
 debian/.gitattributes |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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

-- 
qtimageformats packaging