]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Tue, 18 Nov 2014 12:12:19 +0000 (13:12 +0100)
committerRemi Collet <remi@php.net>
Tue, 18 Nov 2014 12:12:19 +0000 (13:12 +0100)
* PHP-5.6:
  simplify fpm tests


Trivial merge