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

Merge branch 'PHP-5.4' into PHP-5.5

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

a59ec5d1b0346e2dd097bb076d29f09b7edf12a0