]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 8 Jul 2014 21:31:40 +0000 (14:31 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 8 Jul 2014 21:31:40 +0000 (14:31 -0700)
* PHP-5.4:
  fix unstable test


Trivial merge