From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 26 Feb 2014 14:10:23 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d18089d62181b000d67b66e928cc796d8dd277e7;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add news entry
  add clear_env option to FPM config
---

d18089d62181b000d67b66e928cc796d8dd277e7