[SCM] mplayer2/master: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ecd28a647b4a1443ef276c1a5a6efd9b6287d139
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 4 13:26:53 2011 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index ef11b73..9ada8ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mplayer2 (2.0-134-g84d8671-7) unstable; urgency=low
+
+  [ Alessio Treglia ]
+  * Set Replaces/Conflicts/Provides field to properly fix file overwrite
+    errors (Closes: #640100).
+
+  [ Reinhard Tartler ]
+  * upload to unstable.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Tue, 04 Oct 2011 13:26:01 +0200
+
 mplayer2 (2.0-134-g84d8671-6) unstable; urgency=low
 
   * Drop libsvga support, it's dead upstream (Closes: #640229).

-- 
mplayer2 packaging