[SCM] qtmultimedia packaging branch, ubuntu, updated. ubuntu/5.7.1-20161021-2ubuntu1

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit c9ba4b82d15a13e90031f00066f553041f4f691d
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Sep 15 12:20:39 2016 +0000

    Revert "remove gitattributes from stable branch"
    
    This reverts commit f9795523715cfc607a23e45e8bc56af26c7b116b.
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..af7d4d4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/*.symbols merge=ours

-- 
qtmultimedia packaging