[SCM] x264 packaging branch, master, updated. debian/0.85.1448+git1a6d32-3-36-ga57f928

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6d5522ab1ccbf39c6eb3c85bb8d3ae57a139b9fb
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat May 8 02:06:14 2010 -0400

    Readd gbp.conf file.

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..1615f89
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,6 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = master
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+pristine-tar = True

-- 
x264 packaging