[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-7-2-g50dc283

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 50dc283189cb0a81a68568bf49a0a7969dbbe195
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Aug 28 00:08:51 2014 -0300

    Use dpkg-mergechangelogs for merging changelogs.
---
 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

-- 
QtWebKit packaging