[SCM] mplayer2/master: We are back to master.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d36298815ae411af85bb72b6475b3b762128ce48
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue May 1 03:32:51 2012 +0200

    We are back to master.
    
    Git-Dch: Ignore

diff --git a/debian/gbp.conf b/debian/gbp.conf
index c2bb25f..7d3ad13 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,4 @@
 [DEFAULT]
-debian-branch = master.experimental
-upstream-branch = upstream.experimental
 pristine-tar = True
 compression = bzip2
 

-- 
mplayer2 packaging