Merge "WebInstallerOutput: Restore 'global $wgResourceModules'"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 17 Aug 2014 20:06:26 +0000 (20:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 17 Aug 2014 20:06:26 +0000 (20:06 +0000)

Trivial merge