From: Reedy <Reedy reedy@wikimedia.org>
Date: Mon, 4 Mar 2013 18:03:40 +0000 (+0000)
Subject: Applied patches to new WMF 1.21wmf11 branch
X-Git-Tag: 1.31.0-rc.0~20497
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=855d049c75fe303a7a0fcb06dba60170437a694d;p=lhc%2Fweb%2Fwiklou.git

Applied patches to new WMF 1.21wmf11 branch
---

diff --git a/.gitreview b/.gitreview
index 0ec44b8359..8d1011892a 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/core.git
-defaultbranch=master
+defaultbranch=wmf/1.21wmf11
 defaultrebase=0
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c67cea68aa..32b3fea47e 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -59,7 +59,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion = '1.21alpha';
+$wgVersion = '1.21wmf11';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename = 'MediaWiki';