Merge "Fixed api.php fatals due to protected field usage"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 2 Dec 2013 18:58:20 +0000 (18:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 2 Dec 2013 18:58:20 +0000 (18:58 +0000)

Trivial merge