[DRE-commits] [SCM] ruby-activesupport-4.0.git branch, master, updated. 96bbcafcef20e41394c9ebefff9f56688a21d394

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 96bbcafcef20e41394c9ebefff9f56688a21d394
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Mar 28 15:27:05 2013 +0100

    Move RoR 4.0 to master branch

diff --git a/debian/gbp.conf b/debian/gbp.conf
index d922e3b..21ccd9b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,5 +3,5 @@ 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

-- 
ruby-activesupport-4.0.git