Merge "Rename Wiki.php to MediaWiki.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 15 Jul 2014 20:54:49 +0000 (20:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 15 Jul 2014 20:54:49 +0000 (20:54 +0000)

Trivial merge