Merge "Add better error message for files which exceeds $wgMaxImageArea"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 15 Dec 2014 08:58:23 +0000 (08:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 15 Dec 2014 08:58:23 +0000 (08:58 +0000)

Trivial merge