Merge "Pass config to ResourceLoader from OutputPage"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 22 Aug 2014 22:16:10 +0000 (22:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 22 Aug 2014 22:16:10 +0000 (22:16 +0000)

Trivial merge