]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Fri, 24 May 2013 10:10:39 +0000 (12:10 +0200)
committerRemi Collet <remi@php.net>
Fri, 24 May 2013 10:10:39 +0000 (12:10 +0200)
* PHP-5.4:
  Fixed Bug #64915 (error_log ignored when daemonize=0)


Trivial merge