[SCM] gmerlin-encoders/master.ubuntu: Merge debian/changelog with master

[alessio at users.alioth.debian.org]

The following commit has been merged in the master.ubuntu branch:
commit d7bdda5abae9fb61467d5068821a5d89483a97e0
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Feb 10 09:35:20 2011 +0100

    Merge debian/changelog with master

diff --git a/debian/changelog b/debian/changelog
index faf93a6..b9edc64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gmerlin-encoders (1.0.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Alessio Treglia <alessio at debian.org>  Thu, 10 Feb 2011 09:23:50 +0100
+
 gmerlin-encoders (1.0.0-1ubuntu1) natty; urgency=low
 
   * Update gbp config.

-- 
gmerlin-encoders packaging