Merge "Make the global objects documentation consistent in Setup.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 1 Jul 2014 11:18:05 +0000 (11:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 1 Jul 2014 11:18:05 +0000 (11:18 +0000)
1  2 
includes/Setup.php

Simple merge