]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorzoe slattery <zoe@php.net>
Tue, 15 May 2012 13:40:49 +0000 (14:40 +0100)
committerzoe slattery <zoe@php.net>
Tue, 15 May 2012 13:40:49 +0000 (14:40 +0100)
* PHP-5.4:
  Changes to remaining two tests, #62022


Trivial merge