Merge "bug 42649 - PHP Fatal error: Call to a member function isLocal() on a non...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 8 Apr 2013 23:19:55 +0000 (23:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 8 Apr 2013 23:19:55 +0000 (23:19 +0000)

Trivial merge