Merge "resourceloader: Remove wfExpandUrl() from ResourceLoaderImage"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 2 Apr 2016 15:54:18 +0000 (15:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 2 Apr 2016 15:54:18 +0000 (15:54 +0000)

Trivial merge