]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 23 Jul 2013 08:00:07 +0000 (10:00 +0200)
committerAnatol Belski <ab@php.net>
Tue, 23 Jul 2013 08:00:07 +0000 (10:00 +0200)
* PHP-5.4:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt


Trivial merge