From: Stephane Glondu <steph@glondu.net>
Date: Sat, 16 Apr 2011 13:46:19 +0000 (+0200)
Subject: Merge 312 branches
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~318
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cc8a662174c89b18ea39f5096bd48c33f1884d58;p=ocaml.git

Merge 312 branches
---

diff --git a/debian/gbp.conf b/debian/gbp.conf
index d84e16cf..cec628c7 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