[DRE-commits] [SCM] ruby-activesupport-3.2.git branch, master, updated. debian/3.2.13-1-10-g3a542cd

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 3a542cd022c515a92e85bc19a4a6bddc658fd692
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed May 29 10:55:28 2013 +0200

    Update gbp.conf

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-3.2.git