]> granicus.if.org Git - php/commit
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)
commit593505f2668cf649efaf67b646793ff3924e87ca
tree7b64fb3f7373cf886637b7b586ebddb1797e2bd9
parentbca0e5edd5b80990b36e611da59ee32b6a0a0161
parent8cdefd3d101fe6c6ebca742b51204b13ab506842
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+