Merge "Make LocalFile::lock() initialize DBO_TRX transactions"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 15 Jul 2016 13:58:50 +0000 (13:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 15 Jul 2016 13:58:50 +0000 (13:58 +0000)

Trivial merge