Merge "Update formatting and docs"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 7 Apr 2013 15:32:52 +0000 (15:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 7 Apr 2013 15:32:52 +0000 (15:32 +0000)

Trivial merge