Merge "Guard against non-object returns from File::getHander()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 17 Sep 2013 17:22:44 +0000 (17:22 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 17 Sep 2013 17:22:44 +0000 (17:22 +0000)

Trivial merge