[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.11.2-4-47-g917819a

[Stephane Glondu]

The following commit has been merged in the master branch:
commit cc8a662174c89b18ea39f5096bd48c33f1884d58
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Apr 16 15:46:19 2011 +0200

    Merge 312 branches

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

-- 
OCaml packaging