Merge "startup: Update documentation"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 29 Aug 2014 18:53:10 +0000 (18:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 29 Aug 2014 18:53:10 +0000 (18:53 +0000)

Trivial merge