Merge "Made profileIn/profileOut methods a no-op"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 8 Jan 2015 19:45:30 +0000 (19:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 8 Jan 2015 19:45:30 +0000 (19:45 +0000)
1  2 
includes/profiler/ProfilerXhprof.php

Simple merge