Merge "Avoid calling load() in LocalFile::invalidateCache; not needed"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 21 May 2015 18:57:20 +0000 (18:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 21 May 2015 18:57:20 +0000 (18:57 +0000)

Trivial merge