Merge "resourceloader: Make tests less susceptible to timestamp races"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 15 Jul 2015 05:30:24 +0000 (05:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 15 Jul 2015 05:30:24 +0000 (05:30 +0000)

Trivial merge