Merge "Avoid image table updates on file upload failure"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 21 Apr 2014 16:54:19 +0000 (16:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 21 Apr 2014 16:54:19 +0000 (16:54 +0000)
1  2 
includes/filerepo/file/LocalFile.php

Simple merge