]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorChristopher Jones <sixd@php.net>
Tue, 25 Feb 2014 01:02:16 +0000 (17:02 -0800)
committerChristopher Jones <sixd@php.net>
Tue, 25 Feb 2014 01:02:16 +0000 (17:02 -0800)
commita59ec5d1b0346e2dd097bb076d29f09b7edf12a0
treeea07224b6e54d743dca338838109e10144bc0299
parent593505f2668cf649efaf67b646793ff3924e87ca
parentee7671afb5d87b7509b2a815a6b151e3a8a74e76
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+