]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Fri, 6 Feb 2015 05:56:26 +0000 (21:56 -0800)
committerStanislav Malyshev <stas@php.net>
Fri, 6 Feb 2015 05:56:26 +0000 (21:56 -0800)
* PHP-5.5:
  fix tests


Trivial merge