Merge "Update docs"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 18 Dec 2012 14:33:24 +0000 (14:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 18 Dec 2012 14:33:24 +0000 (14:33 +0000)

Trivial merge