[SCM] soundconverter/master: Work in master and upstream

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 55806e3c7cbf77ec5d83d0743cf48caad4bd9352
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Oct 12 00:10:42 2015 +0200

    Work in master and upstream

diff --git a/debian/gbp.conf b/debian/gbp.conf
index edc9982..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

-- 
soundconverter packaging