]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Mon, 5 Jan 2015 16:35:14 +0000 (17:35 +0100)
committerRemi Collet <remi@php.net>
Mon, 5 Jan 2015 16:35:14 +0000 (17:35 +0100)
* PHP-5.5:
  NEWS
  Fix bug #68751 listen.allowed_clients is broken


Trivial merge