Merge "Fix a PHP 5.5 TODO"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 25 Feb 2016 17:12:18 +0000 (17:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 25 Feb 2016 17:12:18 +0000 (17:12 +0000)

Trivial merge