[SCM] x265/master: Revert "Now packing for experimental"

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 626dd41ab67bdf6d67423bafbf5706bef2ec7035
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Aug 16 18:35:39 2016 +0200

    Revert "Now packing for experimental"
    
    This reverts commit e44a5d099b9908d2cb13ac1c37f98c399abd6827.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 16327d3..1270436 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = experimental
-upstream-branch = upstream-experimental
+debian-branch = master
+upstream-branch = upstream

-- 
x265 packaging