From: Ferenc Kovacs <tyrael@php.net>
Date: Mon, 30 Jun 2014 16:38:54 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0RC2~1^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d810c2139fa16953d1a1661e8616046716dd247c;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  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"
---

d810c2139fa16953d1a1661e8616046716dd247c