From: Jerome Loyet <fat@php.net>
Date: Tue, 22 May 2012 06:42:17 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~176
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=085e6a9f3b6abc897577e7469ad92c15cd99fac1;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #61045 (fpm don't send error log to fastcgi clients)
  - fix NEWS for bug #61812
---

085e6a9f3b6abc897577e7469ad92c15cd99fac1