Merge "Simplified some code and broke lines in thumb.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 21 Sep 2013 16:08:06 +0000 (16:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 21 Sep 2013 16:08:06 +0000 (16:08 +0000)

Trivial merge