Merge "resourceloader: Use content-neutral context when computing module versions"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 18 Jun 2015 20:43:11 +0000 (20:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 18 Jun 2015 20:43:11 +0000 (20:43 +0000)

Trivial merge