]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 17 Nov 2014 14:23:33 +0000 (15:23 +0100)
committerRemi Collet <remi@php.net>
Mon, 17 Nov 2014 14:23:33 +0000 (15:23 +0100)
* PHP-5.6:
  Add new FPM test for IPv4/IPv6


Trivial merge