Merge "phpunit: Make getResourceLoaderContext() more extendable"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 5 Dec 2016 19:57:21 +0000 (19:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 5 Dec 2016 19:57:21 +0000 (19:57 +0000)

Trivial merge