[SCM] gpac/master: Update debian/gbp.conf, now it is on master.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8f84044cde9dff698ac23f25fd70f8fe8fdf551b
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Apr 20 14:28:28 2012 +0200

    Update debian/gbp.conf, now it is on master.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index bcd7a46..4f24002 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,3 @@
 [DEFAULT]
-debian-branch = master.experimental
-upstream-branch = upstream.experimental
 pristine-tar = True
 compression = bzip2

-- 
gpac packaging