Merge "Made LocalFile::loadExtraFromDB() handle re-upload race conditions"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 24 Apr 2014 22:17:51 +0000 (22:17 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 24 Apr 2014 22:17:51 +0000 (22:17 +0000)
1  2 
includes/filerepo/file/LocalFile.php

Simple merge