[SCM] ffmpeg/master: track 'master' branch

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit acef44209adb1c8dc47eb8c09e4d7acfaf257004
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 29 21:37:11 2011 +0100

    track 'master' branch

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

-- 
FFmpeg packaging