[SCM] Packaging for cube2font branch, master, updated. debian/1.2-2-28-gb9a14d0

[Martin Erik Werner]

The following commit has been merged in the master branch:
commit 04befb2a1cd521ac897a9ff06ed7e97d40d6100e
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Sat Sep 1 19:20:45 2012 +0200

    update gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
index b346aeb..dc8fbfe 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,3 @@
 [DEFAULT]
-upstream-branch = upstream-svn
-debian-branch = master-svn
+upstream-branch = upstream
+debian-branch = master

-- 
Packaging for cube2font