]> granicus.if.org Git - php/commit
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)
commitd66640a33400a96ae06df4d4381b7df0b6b470bb
treeb7c5c8f71863edddfe4e492d820dc56dd405b5ce
parent063a06b8e569b1256f94b62154f17b234201a86f
parent23db11976889c3600cf7853fe0fd687a1c9435e6
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #68423i PHP-FPM will no longer load all pools