[SCM] transcode/master: Re-setup gbp.conf, someone forgot to push upstream branch properly

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 60ffb30180a56c2a530205cd2c33d7c9cdf4fbc1
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Feb 21 11:54:13 2012 +0100

    Re-setup gbp.conf, someone forgot to push upstream branch properly

diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..7be47fc 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,4 @@
 [DEFAULT]
 pristine-tar = True
+debian-branch = master.experimental
+upstream-branch = upsteam.experimental

-- 
transcode packaging