Merge "resourceloader: Disable flaky test ResourceLoaderModule::getVersionHash"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 20 Oct 2015 02:16:30 +0000 (02:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 20 Oct 2015 02:16:30 +0000 (02:16 +0000)

Trivial merge