Merge "Move around/add PHP_SAPI check, making find-entries happier."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 20 Feb 2013 23:56:56 +0000 (23:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 20 Feb 2013 23:56:56 +0000 (23:56 +0000)

Trivial merge