[SCM] vlc/ubuntu: Release 1.1.5-2ubuntu1 to Ubuntu natty.

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 487eeadc846f50d7b8180fdee209b793ca943178
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Nov 24 00:53:01 2010 +0100

    Release 1.1.5-2ubuntu1 to Ubuntu natty.

diff --git a/debian/changelog b/debian/changelog
index b8d4059..ee14f68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vlc (1.1.5-2ubuntu1) natty; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    - build and install the libx264 plugin
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Wed, 24 Nov 2010 00:51:28 +0100
+
 vlc (1.1.5-2) experimental; urgency=low
 
   [ Reinhard Tartler ]

-- 
VLC media player packaging