[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3++final-1.exp1-8-gf21911f

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f21911fddd6fbc1ac19c526f255a0f1358dee737
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Aug 1 10:20:51 2010 -0400

    work in master

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 84c0636..1615f89 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