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

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e56024fa620a911d381f2a5b23e483fbeaeda466
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue May 13 12:34:20 2014 +0200

    Ready for release

diff --git a/debian/changelog b/debian/changelog
index bb25cc9..395914d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gmerlin-encoders (1.2.0-7) unstable; urgency=medium
+
+  * Enabled libav10.patch (it was accidentally disabled)
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>  Tue, 13 May 2014 12:34:06 +0200
+
 gmerlin-encoders (1.2.0-6) unstable; urgency=medium
 
   * Support libav10 (Closes: #739425), thanks to Anton Khirnov for the patch

-- 
gmerlin-encoders packaging