Merge "Remove isVolatile/markVolatile logic from LocalFile"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 6 Mar 2015 21:23:17 +0000 (21:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 6 Mar 2015 21:23:17 +0000 (21:23 +0000)

Trivial merge