From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 5 Jul 2016 20:08:53 +0000 (+0000)
Subject: Merge "Fixes to LocalFile::lock()"
X-Git-Tag: 1.31.0-rc.0~6454
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=78c1c6de078e227bc5fab39a89abd3dfcbcf0bd0;p=lhc%2Fweb%2Fwiklou.git

Merge "Fixes to LocalFile::lock()"
---

78c1c6de078e227bc5fab39a89abd3dfcbcf0bd0