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

Trivial merge