Merge "Correct variable types in phpdoc"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 9 Aug 2014 12:37:50 +0000 (12:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 9 Aug 2014 12:37:50 +0000 (12:37 +0000)

Trivial merge