Merge "Make TransactionProfiler::setSilenced() calls handle nesting"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 13 Oct 2016 17:48:58 +0000 (17:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 13 Oct 2016 17:48:58 +0000 (17:48 +0000)

Trivial merge