]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 1 Dec 2014 06:29:19 +0000 (07:29 +0100)
committerRemi Collet <remi@php.net>
Mon, 1 Dec 2014 06:29:19 +0000 (07:29 +0100)
* PHP-5.6:
  XFAIL as catch_workers_output = yes seems not reliable


Trivial merge