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


Trivial merge