Merge "Avoid attempting to prerender thumbnails that will fail"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 3 Oct 2014 17:45:15 +0000 (17:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 3 Oct 2014 17:45:15 +0000 (17:45 +0000)
1  2 
includes/upload/UploadBase.php

Simple merge