]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 1 Sep 2015 19:24:14 +0000 (12:24 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 1 Sep 2015 19:24:14 +0000 (12:24 -0700)
* PHP-5.5:
  fix unit tests


Trivial merge