Merge "Made LocalFile move/delete/restore handle network partitions better"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 21 Aug 2014 15:38:10 +0000 (15:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 21 Aug 2014 15:38:10 +0000 (15:38 +0000)
1  2 
includes/filerepo/FileRepo.php
includes/filerepo/file/LocalFile.php

Simple merge
Simple merge