Merge "Removed ScopedPHPTimeout; unused"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 10 Aug 2015 18:37:48 +0000 (18:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 10 Aug 2015 18:37:48 +0000 (18:37 +0000)

Trivial merge