Merge "Revert "Consolidate parts of WebStart.php and doMaintenance.php into Initializ...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 28 Aug 2014 22:12:09 +0000 (22:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 Aug 2014 22:12:09 +0000 (22:12 +0000)

Trivial merge