[DRE-commits] [SCM] rails.git branch, master, updated. debian/2%2.3.14.2-14-g0930779

[Ondřej Surý]

The following commit has been merged in the master branch:
commit db6cd243c428ad44394cb4eb01ac9e2dd76c2258
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon May 27 14:37:18 2013 +0200

    Update gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
index cede6c6..c31be83 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,3 @@
 [DEFAULT]
 pristine-tar = True
-upstream-branch = upstream-experimental
-debian-branch = master-experimental
+debian-branch = master

-- 
rails.git