From: Ferenc Kovacs <tyrael@php.net>
Date: Mon, 30 Jun 2014 16:39:31 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d26a7cf627ad621f1190ebc3f9fb9af5e04aa77;p=php

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"
---

2d26a7cf627ad621f1190ebc3f9fb9af5e04aa77