]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Fri, 21 Nov 2014 06:35:10 +0000 (07:35 +0100)
committerRemi Collet <remi@php.net>
Fri, 21 Nov 2014 06:35:10 +0000 (07:35 +0100)
commit61f6cd0da56e36de9d682159d0f58894d950b6f8
tree436fdeaa0cc242b6281e2d084a3080145c359f89
parent245d01892a517f9e4600d2db1cdae1dc3213c4e3
parentcf3a90228644455f93ff96eddf2e27e9e5a8c812
Merge branch 'PHP-5.5' into PHP-5.6

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