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)
commitac971d9a068ae9cb4b14a3811a2949ce0116fbc5
tree8d6ddb35b5a937b45c7f04b3bad33b87bc81e92b
parentb31c093855be5e0a465bfa6b779c0f8c2e86a7d3
parent72c0ce43a854d5cd5601d1d19423518065ce33ff
Merge "Add $wgServerName"
RELEASE-NOTES-1.24
includes/DefaultSettings.php
includes/api/ApiQuerySiteinfo.php
includes/parser/Parser.php