]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.4:
  NEWS
  Fix Bug #67531  syslog cannot be set in pool configuration
  Fix Bug #67530  error_log=syslog ignored


Trivial merge