bump to 1.12.01.12.0

2 files changed, 19 insertions, 1 deletions

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 28ac6624bc81..f38b41a5e02e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -5,7 +5,25 @@ setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
 == MediaWiki 1.12.0 ==
 
+This is the quarterly branch release of MediaWiki for Winter 2008.
+
+
+MediaWiki is now using a "continuous integration" development model with
+quarterly snapshot releases. The latest development code is always kept
+"ready to run", and in fact runs our own sites on Wikipedia.
+
+Release branches will continue to receive security updates for about a year
+from first release, but nonessential bugfixes and feature developments
+will be made on the development trunk and appear in the next quarterly release.
+
+Those wishing to use the latest code instead of a branch release can obtain
+it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
+
+
+Changes since 1.12.0rc1:
+
 * (bug 13359) Double-escaping in Special:Allpages
+* Localization updates.
 
 
 == MediaWiki 1.12.0rc1 ==
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8a2586aa91c8..376e55b160d7 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -31,7 +31,7 @@ require_once( "$IP/includes/SiteConfiguration.php" );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.12.0rc1';
+$wgVersion			= '1.12.0';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';