From: Anatol Belski <ab@php.net>
Date: Wed, 19 Nov 2014 22:21:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into native-tls
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14fa5339f86cac3a1b3ecfdf50c4ee0f31ca214e;p=php

Merge remote-tracking branch 'origin/master' into native-tls

* origin/master:
  NEWS
  Fix #68355: Inconsistency in example php.ini comments
  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
---

14fa5339f86cac3a1b3ecfdf50c4ee0f31ca214e