[SCM] vlc/master: Release 1.1.12-2 to Debian unstable.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 346f5638924d6f6a80d7e722dbd422387293988a
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Oct 13 20:18:51 2011 +0200

    Release 1.1.12-2 to Debian unstable.

diff --git a/debian/changelog b/debian/changelog
index 63fdadd..ae20c49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vlc (1.1.12-2) unstable; urgency=low
+
+  * Apply patches from upstream's 1.1 maintenance branch.
+    - Turn on XVideo color key automatic painting (fix upstream #4643)
+    - Set channel map when using PulseAudio 1.0
+    - Translation updates
+
+ -- Benjamin Drung <bdrung at debian.org>  Thu, 13 Oct 2011 20:17:03 +0200
+
 vlc (1.1.12-1) unstable; urgency=low
 
   * New upstream release.

-- 
VLC media player packaging