[SCM] lives/master: Update debian/gbp.conf properly.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2abbcbe1fd906f8721115dda81c40da75588c828
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Aug 21 12:37:09 2012 +0200

    Update debian/gbp.conf properly.

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

-- 
lives packaging