From 3c039d0aada049122d9635dccf738464de00dc48 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Mon, 30 Apr 2012 18:34:29 +0000
Subject: [PATCH] Applied patches to new WMF 1.20wmf2 branch

---
 includes/DefaultSettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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';
-- 
2.20.1