Merge "Making missing old files not try to render a thumbnail"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 28 Aug 2014 07:43:26 +0000 (07:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 Aug 2014 07:43:26 +0000 (07:43 +0000)
1  2 
includes/filerepo/file/File.php

Simple merge