[SCM] lives/master: Fix gbp.conf.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c5e4b9b3b77ccefe1ce2df3a520c76f168994f39
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon May 6 08:14:53 2013 +0200

    Fix gbp.conf.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index c5166d1..4f24002 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,3 @@
 [DEFAULT]
 pristine-tar = True
 compression = bzip2
-debian-branch = master.experimental
-upstream-branch = upstream.experimental

-- 
lives packaging