Merge "Bug 41234 - api prop=imageinfo broken on PHP 5.4"
authorNikerabbit <niklas.laxstrom@gmail.com>
Sat, 20 Oct 2012 14:03:52 +0000 (14:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 20 Oct 2012 14:03:52 +0000 (14:03 +0000)

Trivial merge