From: Anatol Belski <ab@php.net>
Date: Tue, 8 Jul 2014 07:57:36 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~109^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b3cc726be43910de5b0d782c5922534b2deef71;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Backported the patch from bug #67407 into 5.5+
  Backported the patch from bug #67407 into 5.4
  NEWS
  NEWS
  Fix Bug #67530 	error_log=syslog ignored

Conflicts:
	sapi/fpm/fpm/fpm_stdio.c
---

8b3cc726be43910de5b0d782c5922534b2deef71