[SCM] QtWebKit packaging branch, qt5, updated. debian/2.2.1-5-14-g2d2c3f3

[Pino Toscano]

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

The following commit has been merged in the qt5 branch:
commit 44adb7db48720b24d4352a7620885d5d55521e50
Author: Pino Toscano <pino at debian.org>
Date:   Sun Apr 21 20:58:41 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

-- 
QtWebKit packaging