]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Mon, 30 Jun 2014 16:39:31 +0000 (18:39 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 30 Jun 2014 16:39:31 +0000 (18:39 +0200)
commit2d26a7cf627ad621f1190ebc3f9fb9af5e04aa77
tree82f115024cb480f4d174b589bef53b0c04f31049
parent62b45983f7441d40dfbf9f115d212575f684d3a2
parent023d53fea5109aef3a1fc9ec7864b02ea1ec054c
Merge branch 'PHP-5.6'

* PHP-5.6:
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530  error_log=syslog ignored"