[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8-1-2-gfb3cc7a

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 069c0d7de0f64da07ec90fa4ead90799bc464a41
Author: Mirco Bauer <meebey at meebey.net>
Date:   Tue Feb 8 16:30:48 2011 +0100

    Set debian and upstream branch back for git-buildpackage

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 231149e..1d014cb 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,5 +4,5 @@ meta = True
 [git-import-orig]
 postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
 [DEFAULT]
-debian-branch = master-experimental
-upstream-branch = upstream-experimental
+debian-branch = master
+upstream-branch = upstream

-- 
smuxi