From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 26 Feb 2014 14:14:50 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~504^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25941c293f00554c43db6500110ca087c666179e;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  add NEWS block for 5.6.0 beta1
  add news entry
  add news entry
  add clear_env option to FPM config
  add clear_env option to FPM config
  Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
  Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
---

25941c293f00554c43db6500110ca087c666179e