Merge "Replace FOR UPDATE with LockManager use in LocalFile::lock()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 20 May 2014 22:07:21 +0000 (22:07 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 20 May 2014 22:07:21 +0000 (22:07 +0000)

Trivial merge