Merge "resourceloader: Use FileContentsHasher in safeFileHash()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 24 Sep 2015 01:00:17 +0000 (01:00 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 24 Sep 2015 01:00:17 +0000 (01:00 +0000)

Trivial merge