Merge "Fix PHPDoc"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 1 Apr 2013 20:10:04 +0000 (20:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 1 Apr 2013 20:10:04 +0000 (20:10 +0000)

Trivial merge