Merge "Fix error handling in File::createThumb."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 13 Dec 2013 18:17:30 +0000 (18:17 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 13 Dec 2013 18:17:30 +0000 (18:17 +0000)

Trivial merge