]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Thu, 20 Nov 2014 06:52:19 +0000 (07:52 +0100)
committerRemi Collet <remi@php.net>
Thu, 20 Nov 2014 06:52:19 +0000 (07:52 +0100)
* PHP-5.6:
  Factorization and consistency - create a fpm_use_error_log() to check when file or stderr should be used - use it everywhere for consistency - add some comments


Trivial merge