Merge "Update formatting, return of the API classes"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 14 Nov 2013 18:50:16 +0000 (18:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 14 Nov 2013 18:50:16 +0000 (18:50 +0000)

Trivial merge