Merge "Workaround for thumbnail pre rendering with PHP < 5.4.7"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 1 Oct 2014 21:24:49 +0000 (21:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 1 Oct 2014 21:24:49 +0000 (21:24 +0000)

Trivial merge