[SCM] qttools packaging branch, master, updated. debian/5.0.2-1-8-g775ce5c

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 775ce5c369c39d014969740fcaf39090a442fa0d
Author: Pino Toscano <pino at debian.org>
Date:   Sun Apr 21 20:35:09 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

-- 
qttools packaging