Merge "Make the User Timing API safe to use in MediaWiki"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 21 Jul 2015 06:23:49 +0000 (06:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 21 Jul 2015 06:23:49 +0000 (06:23 +0000)

Trivial merge