From: Reedy <reedy@wikimedia.org>
Date: Mon, 30 Apr 2012 18:34:29 +0000 (+0000)
Subject: Applied patches to new WMF 1.20wmf2 branch
X-Git-Tag: 1.31.0-rc.0~23776^2~2
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=3c039d0aada049122d9635dccf738464de00dc48;p=lhc%2Fweb%2Fwiklou.git

Applied patches to new WMF 1.20wmf2 branch
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d3c24ca301..9801e04ed1 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -33,7 +33,7 @@ $wgConf = new SiteConfiguration;
 /** @endcond */
 
 /** MediaWiki version number */
-$wgVersion = '1.20alpha';
+$wgVersion = '1.20wmf2';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename = 'MediaWiki';