]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorChristopher Jones <sixd@php.net>
Tue, 25 Feb 2014 00:35:08 +0000 (16:35 -0800)
committerChristopher Jones <sixd@php.net>
Tue, 25 Feb 2014 00:35:08 +0000 (16:35 -0800)
* PHP-5.4:
  Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+


Trivial merge