]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorzoe slattery <zoe@php.net>
Tue, 15 May 2012 10:48:21 +0000 (11:48 +0100)
committerzoe slattery <zoe@php.net>
Tue, 15 May 2012 10:48:21 +0000 (11:48 +0100)
* PHP-5.4:
  Small fixes to tests, see #62022


Trivial merge