]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4.45' into PHP-5.5.29
authorStanislav Malyshev <stas@php.net>
Tue, 1 Sep 2015 07:59:55 +0000 (00:59 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 1 Sep 2015 07:59:55 +0000 (00:59 -0700)
* PHP-5.4.45:
  fix test


Trivial merge