Merge "resourceloader: Fix undefined $filename in safeFileHash()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 6 Aug 2015 08:48:04 +0000 (08:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 6 Aug 2015 08:48:04 +0000 (08:48 +0000)

Trivial merge