Merge "Fix-up for I21bb3f08e7f: make ResourceLoaderModule::expandRelativePaths public"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 2 Oct 2015 01:44:44 +0000 (01:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 2 Oct 2015 01:44:44 +0000 (01:44 +0000)

Trivial merge