[SCM] libav/master: work in master branch

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 753abd6ea59f10bdb6ed13611abc8cb9a8c8124a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 11 12:30:29 2014 -0400

    work in master branch

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 349d1e9..189521b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
-upstream-branch = upstream.experimental
-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