Applied patches to new WMF 1.21wmf6 branch

diff --git a/.gitreview b/.gitreview
index 0ec44b8..435b8fd 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/core.git
-defaultbranch=master
+defaultbranch=wmf/1.21wmf6
 defaultrebase=0

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c2f7ea6..e90a065 100644 (file)
--- 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.21wmf6';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename = 'MediaWiki';