Merge "Increase LocalFile lock() timeout and improve error message"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 17 May 2016 09:24:15 +0000 (09:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 17 May 2016 09:24:15 +0000 (09:24 +0000)

Trivial merge