[SCM] vlc/master: Update changelog

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 316d7ad606d0b36884b450d2a31bd2b35b4bdb78
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Aug 27 23:11:46 2014 +0200

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index 025704e..55332cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+vlc (2.2.0~pre2-5) UNRELEASED; urgency=medium
+
+  [ Mateusz Łukasik ]
+  * Fix typo in changelog
+
+  [ Benjamin Drung ]
+  * Disable vpx plugin (not needed when having libavcodec)
+  * Remove hurd.patch, because this is a bug in Hurd and not in VLC.
+
+  [ Sebastian Ramacher ]
+  * debian/patches/link-vlc-cache-gen-with-gobject.patch: Link vlc-cache-gen
+    against gobject to prevent gobject related crashes. (Closes: #752544)
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Wed, 27 Aug 2014 23:10:55 +0200
+
 vlc (2.2.0~pre2-4) unstable; urgency=medium
 
   * debian/vlc-nox.install.in: libi420_yuy2_altivec_plugin.so moved to

-- 
VLC media player packaging