[DRE-commits] [SCM] redmine.git branch, master, updated. debian/1.2.1+dfsg2-3-25-g8b3b4f6

[Jérémy Lal]

The following commit has been merged in the master branch:
commit 13b669558b9990beb62ec7c274d22191c1c7608e
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sun Nov 13 09:12:08 2011 +0100

    debian/gbp.conf : use master/upstream branches here.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index eab708b..cbb1852 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -5,8 +5,8 @@ pristine-tar = True
 sign-tags = True
 
 # there are separate branches for stable and experimental
-upstream-branch = upstream-experimental
-debian-branch = master-experimental
+upstream-branch = upstream
+debian-branch = master
 
 
 [git-import-orig]

-- 
redmine.git