[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, master, updated. debian/5.14-1-30-gdf56c78

[Stephane Glondu]

The following commit has been merged in the master branch:
commit b590a1f8941c57266dde87f21cd2a9bfc5d10d6a
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Feb 19 05:56:27 2011 +0100

    Merge experimental branch

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

-- 
camlp5 packaging