[SCM] qtmultimedia packaging branch, master, updated. ed39160a42feedd54ea1546a740af1005abeebe1

[Pino Toscano]

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

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

-- 
qtmultimedia packaging