[SCM] vlc/ubuntu: Release 1.1.11-1ubuntu1 to Ubuntu oneiric.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 49b595c5bef4e32595d9abe8160b2a43683d42fe
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Jul 18 11:41:11 2011 +0200

    Release 1.1.11-1ubuntu1 to Ubuntu oneiric.

diff --git a/debian/changelog b/debian/changelog
index 1542aab..0fc339a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vlc (1.1.11-1ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - build and install the libx264 plugin
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Mon, 18 Jul 2011 11:40:18 +0200
+
 vlc (1.1.11-1) unstable; urgency=high
 
   * New upstream release.

-- 
VLC media player packaging