[SCM] libav/master: update work branches

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 934ff245056bb30ac19278b58327bebac01eb963
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 13 17:11:33 2013 +0200

    update work branches

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

-- 
Libav/FFmpeg packaging