]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Mon, 17 Nov 2014 08:23:26 +0000 (09:23 +0100)
committerRemi Collet <remi@php.net>
Mon, 17 Nov 2014 08:23:26 +0000 (09:23 +0100)
* PHP-5.5:
  NEWS
  Fixed bug #68428 allowed_client is IPv4 only


Trivial merge