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

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f7b2bb4d33a14d940583144cc06470dd9432bd3a
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Oct 10 01:49:27 2012 +0100

    New changelog entry.

diff --git a/debian/changelog b/debian/changelog
index 5321041..953e733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gmerlin-encoders (1.2.0-4) unstable; urgency=low
+
+  * Merge with Ubuntu:
+    - Build-depend on libmjpegtools-dev.
+    - Provide gmerlin-encoders-extra.
+  * Update package description.
+
+ -- Alessio Treglia <alessio at debian.org>  Wed, 10 Oct 2012 01:48:36 +0100
+
 gmerlin-encoders (1.2.0-3) unstable; urgency=low
 
   * Add myself as uploader.

-- 
gmerlin-encoders packaging