Merge "Update docs"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 12 Mar 2013 02:11:07 +0000 (02:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 12 Mar 2013 02:11:07 +0000 (02:11 +0000)

Trivial merge