[SCM] mplayer/master: work in branch 'master'

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 34afc3dd622cff3c5955375df95016dd9fdb518b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jan 12 22:19:53 2012 +0100

    work in branch 'master'
    
    This reverts commit d84fb7ea1a084a7e17255d7c68f27bf5773134fd.
    
    Git-Dch: ignore

diff --git a/debian/gbp.conf b/debian/gbp.conf
index a37123a..a999e17 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = upstream
-debian-branch = master.experimental
+debian-branch = master
 upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s
 pristine-tar = True

-- 
mplayer packaging