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

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d380a17b4dfeadeef67c5be4e4278c5d5b875172
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Mon Mar 10 17:31:59 2014 +0100

    Ready for upload

diff --git a/debian/changelog b/debian/changelog
index 2766dba..bb25cc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gmerlin-encoders (1.2.0-6) unstable; urgency=medium
+
+  * Support libav10 (Closes: #739425), thanks to Anton Khirnov for the patch
+  * Regenerated debian/(control,copyright_hints)
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>  Mon, 10 Mar 2014 17:27:19 +0100
+
 gmerlin-encoders (1.2.0-5) unstable; urgency=medium
 
   [ Jonas Smedegaard ]

-- 
gmerlin-encoders packaging