]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Fri, 14 Nov 2014 16:32:46 +0000 (17:32 +0100)
committerRemi Collet <remi@php.net>
Fri, 14 Nov 2014 16:32:46 +0000 (17:32 +0100)
* PHP-5.5:
  Fix bug #68423i PHP-FPM will no longer load all pools


Trivial merge