Merge "Update documentation and break long lines"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 20 Nov 2013 05:13:32 +0000 (05:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 20 Nov 2013 05:13:32 +0000 (05:13 +0000)

Trivial merge