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


Trivial merge