Merge "resourceloader: Shorten cache expiry if 'version' query doesn't match"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 2 Sep 2016 23:56:26 +0000 (23:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 2 Sep 2016 23:56:26 +0000 (23:56 +0000)

Trivial merge