[SCM] gmerlin-encoders/master.ubuntu: New changelog entry.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master.ubuntu branch:
commit 79e5030ec34c1f53b915240e28f7583d4b51ce6c
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jun 12 12:15:32 2012 +0200

    New changelog entry.

diff --git a/debian/changelog b/debian/changelog
index 1ad00b2..d8eb20b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gmerlin-encoders (1.2.0-2ubuntu1) UNRELEASED; urgency=low
+
+  * Merge with Debian unstable, Ubuntu remaining changes:
+    - Build-depend on libmjpegtools-dev.
+    - Provide gmerlin-encoders-extra.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Tue, 12 Jun 2012 12:14:12 +0200
+
 gmerlin-encoders (1.2.0-2) unstable; urgency=low
 
   * Provides: gmerlin-encoders

-- 
gmerlin-encoders packaging