[SCM] gmerlin-avdecoder/master: Ready for upload

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 18814cc4b32b3cc307df1a28456b8e8b185b1a24
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Nov 3 13:09:41 2015 +0100

    Ready for upload

diff --git a/debian/changelog b/debian/changelog
index c99c5ae..0d31411 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gmerlin-avdecoder (1.2.0~dfsg-6) unstable; urgency=medium
+
+  * Fix FTBFS with ffmpeg-2.9.
+    Thanks to Andreas Cadhalpun (Closes: #803817)
+  * Update Vcs-Browser stanza
+  * Added debian/git-tuneclone.sh script
+  * Updated debian/copyright
+  * Bumped Standards-Version to 3.9.6
+  * Regenerated debian/control|copyright_hints
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>  Tue, 03 Nov 2015 13:08:58 +0100
+
 gmerlin-avdecoder (1.2.0~dfsg-5) unstable; urgency=medium
 
   * Support libav10 (Closes: #739302), thanks to Anton Khirnov for the patch

-- 
gmerlin-avdecoder packaging