[SCM] qtscript packaging branch, master, updated. dcee84f6050e5b97418c7db57b27cdea6ee3e1bb

[Pino Toscano]

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

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

-- 
qtscript packaging