]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Fri, 27 Jun 2014 07:50:27 +0000 (09:50 +0200)
committerRemi Collet <remi@php.net>
Fri, 27 Jun 2014 07:50:27 +0000 (09:50 +0200)
commit13c5bb9600307ea8b17132aeff2dff4e558c46c3
tree52a1fc35f728ada32887157a6fea13f81ff3c734
parentb1433d86b269ea789f57a0de9c0d998b22152ddf
parent334758794da5fc38a5fb9cf2c962eb535bab6b67
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fix Bug #67531  syslog cannot be set in pool configuration
  Fix Bug #67530  error_log=syslog ignored