[SCM] bristol/master: Update debian/gbp.conf

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5b79b66797198dcd0dff12fd896dbca5f2d35df9
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 9 12:26:44 2013 +0200

    Update debian/gbp.conf
    
    Git-Dch: Ignore

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

-- 
bristol packaging