[SCM] ffms2/master: change branch back to master

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0e50e647c90350329d3bdebe81b0563bb1199953
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 5 16:33:36 2010 +0100

    change branch back to master

diff --git a/debian/gbp.conf b/debian/gbp.conf
index d8d8b1e..c31be83 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,3 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = ubuntu
+debian-branch = master

-- 
ffms2 packaging