[SCM] jalv/master: Fix gbp.conf

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 386fcbf0fb216b2ce9c6180cfb3fc3465343b4b2
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Aug 28 09:32:12 2013 +0100

    Fix gbp.conf
    
    Git-Dch: Ignore

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

-- 
jalv packaging