Merge "Add tests for OutputPage::makeResourceLoaderLink()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 7 Jul 2014 16:14:24 +0000 (16:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 7 Jul 2014 16:14:24 +0000 (16:14 +0000)

Trivial merge