]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorJerome Loyet <fat@php.net>
Tue, 22 May 2012 06:42:17 +0000 (08:42 +0200)
committerJerome Loyet <fat@php.net>
Tue, 22 May 2012 06:42:17 +0000 (08:42 +0200)
* PHP-5.4:
  - Fixed bug #61045 (fpm don't send error log to fastcgi clients)
  - fix NEWS for bug #61812


Trivial merge