[SCM] mplayer/master: work on master branch

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 976493d96c9d51daaadb5c1e2eca0ac255649fb3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Sep 2 09:30:18 2011 +0200

    work on master branch

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