[SCM] x264 packaging branch, master, updated. debian/0.svn20090621+git364d7d-1-11-g23b5e69

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a716fa875f4dc0a4687e5bf3d4fd30f399a51b68
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 25 18:19:39 2009 +0200

    update gbp.conf

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

-- 
x264 packaging