From: Remi Collet <remi@php.net>
Date: Wed, 19 Nov 2014 15:49:37 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~44^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf00c1b2e7efbf7954ada39d87b8de7f80d30570;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  Fixed bug #68452 php-fpm man page is oudated (-O)
  NEWS
  Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)
  NEWS
  Fixed bug #68381 Set FPM log level earlier during init
---

cf00c1b2e7efbf7954ada39d87b8de7f80d30570