Merge "LocalFile: Ensure same timestamp for log entry and image revision"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 25 Jan 2016 20:13:30 +0000 (20:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 25 Jan 2016 20:13:30 +0000 (20:13 +0000)

Trivial merge