]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Fri, 21 Nov 2014 06:37:05 +0000 (07:37 +0100)
committerRemi Collet <remi@php.net>
Fri, 21 Nov 2014 06:37:05 +0000 (07:37 +0100)
commita849096c08eb9fd6c7aeb8c7218a64987edea9f1
treeb7457cf2e4f3555c587efafdfd913a7f5a9583cf
parent9de44a29e0b60a359d53efd8752772405df29693
parent5234c2941f6fef488eea2bb625c0d5c88c2e6093
Merge branch 'PHP-5.6'

* PHP-5.6:
  add test for #68391
  NEWS
  NEWS
  Fixed bug #68391 Returns the pool config files in order
sapi/fpm/fpm/fpm_conf.c