Merge "mediawiki.special.upload: Don't fail when trying to thumbnail invalid file"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 15 Apr 2016 19:11:07 +0000 (19:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 15 Apr 2016 19:11:07 +0000 (19:11 +0000)

Trivial merge