Merge "Use Database::timestamp in LocalFile::loadFieldsWithTimestamp"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 11 Sep 2016 00:28:14 +0000 (00:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 11 Sep 2016 00:28:14 +0000 (00:28 +0000)

Trivial merge