[SCM] mplayer/master: track upstream branch

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8c62aee5a09a78522b73dcb200f17ae82b356e9a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 6 17:08:55 2011 +0100

    track upstream branch

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 782d492..1615f89 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-upstream-branch = upstream.rc3
+upstream-branch = upstream
 debian-branch = master
 upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s

-- 
mplayer packaging