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


Trivial merge