[SCM] mplayer/master: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8ff18548141c5ddc27fbed5ec82b5377a1ff3efb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Sep 2 09:28:57 2011 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index daadbc9..89cac5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mplayer (2:1.0~rc4.dfsg1+svn33713-2) unstable; urgency=low
 
   [ Reinhard Tartler ]
   * Upload to unstable
+  * Enable joystick support on Linux only, Closes: #638408
+  * Rebuild fixes toolchain issue on arm, Closes: #637077
 
  -- Reinhard Tartler <siretart at tauware.de>  Fri, 02 Sep 2011 09:22:11 +0200
 
@@ -37,7 +39,6 @@ mplayer (2:1.0~rc4.dfsg1+svn33713-1) experimental; urgency=low
   * Select oss as default audio output module on kFreeBSD, Closes: #598431
 
  -- Reinhard Tartler <siretart at tauware.de>  Sat, 25 Jun 2011 09:05:54 +0200
->>>>>>> master.experimental
 
 mplayer (2:1.0~rc4.dfsg1-2) unstable; urgency=low
 

-- 
mplayer packaging