]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 3 Apr 2012 09:08:02 +0000 (11:08 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 3 Apr 2012 09:08:02 +0000 (11:08 +0200)
* PHP-5.3:
  Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt


Trivial merge