[Pkg-ocaml-maint-commits] [ocaml] 01/02: Prepare merge with master branch

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml.

commit 9e2ac2d4612c413fc694ba293ede442cae70f24b
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Dec 2 18:33:44 2013 +0100

    Prepare merge with master branch
---
 debian/gbp.conf | 2 --
 1 file changed, 2 deletions(-)

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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git