From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 26 Feb 2014 14:13:40 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f5ba1ef69af44bc827c5806ce9198b753d76aba;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  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+
---

2f5ba1ef69af44bc827c5806ce9198b753d76aba