Revert "Applied patches to new WMF 1.21wmf11 branch"

This reverts commit 855d049.

Change-Id: I68f75d9e9cb942f6dc4bdef97a5d5458c9b89875

Author: reedy

Diff for: .gitreview

@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/core.git
-defaultbranch=wmf/1.21wmf11
+defaultbranch=master
 defaultrebase=0

Diff for: includes/DefaultSettings.php

@@ -59,7 +59,7 @@
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion = '1.21wmf11';
+$wgVersion = '1.21alpha';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename = 'MediaWiki';