[SCM] vlc/master: Update changelog

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a69316ef6203f59baf7d943600c85a7bb1952035
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jun 18 16:55:08 2017 +0200

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index d7514c3..8edf8f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vlc (2.2.6-2) UNRELEASED; urgency=medium
+
+  * Upload to unstable.
+  * debian/control:
+    - Remove Build-Conflicts.
+    - Bump Standards-Version.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Sun, 18 Jun 2017 13:50:56 +0200
+
 vlc (2.2.6-1) experimental; urgency=medium
 
   * New upstream release.

-- 
VLC media player packaging