[SCM] mplayer/ubuntu: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 9a8a88a546f55b971ebfde584c9324dff89441dd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Feb 26 14:00:54 2011 +0100

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index d0e8df0..062612e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mplayer (2:1.0~rc4.dfsg1-1ubuntu1) natty; urgency=low
+
+  * Merge from debian/unstable. Remaining changes:
+    - Build depend on lame, x264, xvidcore and libbluray
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sat, 26 Feb 2011 14:00:45 +0100
+
 mplayer (2:1.0~rc4.dfsg1-1) unstable; urgency=low
 
   * upload to unstable

-- 
mplayer packaging