Merge "[FileRepo] Changed LocalFile locking to avoid breaking transactions."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 22 Feb 2013 15:42:02 +0000 (15:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 22 Feb 2013 15:43:34 +0000 (15:43 +0000)

Trivial merge