Merge "Fix documentation."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 13 Aug 2014 20:27:00 +0000 (20:27 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 13 Aug 2014 20:27:00 +0000 (20:27 +0000)

Trivial merge