[SCM] Packaging for Red Eclipse data branch, master, updated. debian/1.2-1-40-gd7b02b9

[Martin Erik Werner]

The following commit has been merged in the master branch:
commit a725654aa8a799d8072e4fe6f0b49ccebe9a67c4
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Sat Sep 1 18:57:00 2012 +0200

    adapt gbp.conf to master

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 Red Eclipse data