Merge "Only configure the transaction profiler if profiling is enabled"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 7 May 2015 20:05:53 +0000 (20:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 7 May 2015 20:05:54 +0000 (20:05 +0000)

Trivial merge