[SCM] vlc/master: Work in master

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c6bbd4506da9e995cd02b7d2de12777066f8a8aa
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Dec 19 19:29:51 2017 +0100

    Work in master

diff --git a/debian/control b/debian/control
index 9853e12..eb270e9 100644
--- a/debian/control
+++ b/debian/control
@@ -133,7 +133,7 @@ Build-Depends: autopoint,
                zsh
 Standards-Version: 4.1.2
 Homepage: https://www.videolan.org/vlc/
-Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/vlc.git -b experimental
+Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/vlc.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/vlc.git
 Rules-Requires-Root: no
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 56dc2c8..73ff49d 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
-debian-branch = experimental
-upstream-branch = upstream.experimental
+debian-branch = master
+upstream-branch = upstream
 pristine-tar = True
 compression = xz
 

-- 
VLC media player packaging