From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 19 Sep 2011 18:09:44 +0000 (+0000)
Subject: Push r97515 into 1.18
X-Git-Tag: 1.31.0-rc.0~27559
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=0039d68a9387561eaf11eea1aaf3ba6e930378a0;p=lhc%2Fweb%2Fwiklou.git

Push r97515 into 1.18
---

diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index 4f2c1eef10..b8e54897e1 100644
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -215,7 +215,7 @@ production.
   To give extensions a better and more flexible way of providing default
   values for preferences a hook has been introdiced in User:getDefaultOptions().
   Setting preferences in $wgDefaultUserOptions still work fine, but when reading
-  them (i.e. with array_keys) to get a list of all preferences, then 
+  them (i.e. with array_keys) to get a list of all preferences, then
   $wgDefaultUserOptions should no longer be used as it will contain those set via
   User:getDefaultOptions().
 
@@ -634,6 +634,7 @@ changes to languages because of Bugzilla reports.
 * (bug 30864) Use bengali numerals for <ol> for Assamese
 * (bug 30817) Restored linktrail for kk (Kazakh)
 * (bug 27398) Add $wgExtraGenderNamespaces for configured gendered namespaces
+* (bug 30846) New LanguageOs class
 
 === Other changes in 1.18 ===
 * Removed legacy wgAjaxWatch javascript global object, no longer in use.
diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 68d9dc2ca1..9246d361e9 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -117,7 +117,6 @@ changes to languages because of Bugzilla reports.
 
 * Uighur (Latin) (ug-latn) was incorrectly marked as right-to-left language.
 * (bug 30217) Make pt-br a fallback of pt
-* (bug 30846) New LanguageOs class
 
 === Other changes in 1.19 ===
 * jquery.mwPrototypes module was renamed to jquery.mwExtension.