[SCM] SETI at home packaging branch, master, updated. debian/6.12_svn1306-2-27-gccf9221

[Guo Yixuan]

The following commit has been merged in the master branch:
commit da5479606e0aef57514465d7b3e7f8fd50bc69a7
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Thu Aug 30 20:31:13 2012 +0800

    gbp.conf merge to master

diff --git a/debian/gbp.conf b/debian/gbp.conf
index f87c8af..2cbc5cb 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = upstream
-debian-branch = master-7
+debian-branch = master
 
 [git-buildpackage]
 pristine-tar = True

-- 
SETI at home packaging