From: Christopher Jones <sixd@php.net>
Date: Tue, 25 Feb 2014 00:35:08 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=593505f2668cf649efaf67b646793ff3924e87ca;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
---

593505f2668cf649efaf67b646793ff3924e87ca