Merge "Remove deprecated profiling config parameters, clarify docs"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 4 Dec 2014 21:12:30 +0000 (21:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Dec 2014 21:12:30 +0000 (21:12 +0000)

Trivial merge