Merge "Revert "wfShellExec: Work around PHP 5.3 stream_select() issue""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 16 Jun 2016 10:30:11 +0000 (10:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 16 Jun 2016 10:30:11 +0000 (10:30 +0000)

Trivial merge