Merge branch 'master' into 'master'

updated submodule url

updated submodule to newly created mirror

See merge request !3

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "upstream"]
 	path = upstream
-	url = git://qt.gitorious.org/qt/qtmultimedia.git
+	url = https://git.merproject.org/mirror/qtmultimedia.git