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

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

The following commit has been merged in the ubuntu branch:
commit 8cdba42f59605a7785f459cb75a286a9d21ff4ba
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Nov 14 22:12:35 2010 +0100

    Release 1.1.5-1ubuntu1 to Ubuntu natty.

diff --git a/debian/changelog b/debian/changelog
index efe8fe9..80484ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vlc (1.1.5-1ubuntu1) natty; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    - build and install the libx264 plugin
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Sun, 14 Nov 2010 22:11:19 +0100
+
 vlc (1.1.5-1) experimental; urgency=low
 
   * New upstream release.

-- 
VLC media player packaging