Merge "resourceloader: Add ResourceLoaderContext::getUserObj and replace use of ...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 23 Oct 2014 21:25:24 +0000 (21:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 23 Oct 2014 21:25:24 +0000 (21:25 +0000)

Trivial merge