Merge "Add $wgServerName"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 9 May 2014 10:18:09 +0000 (10:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 9 May 2014 10:18:09 +0000 (10:18 +0000)
1  2 
RELEASE-NOTES-1.24
includes/DefaultSettings.php
includes/api/ApiQuerySiteinfo.php
includes/parser/Parser.php

Simple merge
Simple merge
Simple merge
Simple merge