Merge "Fix inconsistent docs"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 15 May 2013 08:24:06 +0000 (08:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 15 May 2013 08:24:06 +0000 (08:24 +0000)

Trivial merge