Merge "ResourceLoaderImage: Allow shorthand syntax"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 6 Apr 2015 06:22:49 +0000 (06:22 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 6 Apr 2015 06:22:49 +0000 (06:22 +0000)

Trivial merge