Merge "[FileRepo] Locking and transaction fixes."
authorBrion VIBBER <brion@wikimedia.org>
Tue, 8 May 2012 20:21:44 +0000 (20:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 8 May 2012 20:21:44 +0000 (20:21 +0000)
1  2 
includes/filerepo/file/LocalFile.php

Simple merge