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

[alessio at users.alioth.debian.org]

The following commit has been merged in the master.ubuntu branch:
commit 339b6eff20d1acebfb9ec7229f297039c0d3d0c0
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 31 14:15:33 2011 +0100

    Finalize changelog.

diff --git a/debian/changelog b/debian/changelog
index 2d15f00..ccdb939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gmerlin-encoders (1.0.0-4ubuntu1) precise; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+    - Build-depend on libmjpegtools-dev.
+    - Provide gmerlin-encoders-extra
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Sat, 31 Dec 2011 14:05:14 +0100
+
 gmerlin-encoders (1.0.0-4) unstable; urgency=low
 
   * Update for FFmpeg -> libav (Closes: #638556)

-- 
gmerlin-encoders packaging