Merge "Fix docs on File::getImageSize() they were very misleading"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 27 May 2014 14:53:08 +0000 (14:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 27 May 2014 14:53:08 +0000 (14:53 +0000)

Trivial merge