]> granicus.if.org Git - php/commitdiff
Merge branch 'PHp-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 10 Jun 2015 00:12:11 +0000 (17:12 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 10 Jun 2015 00:12:11 +0000 (17:12 -0700)
* PHp-5.4:
  fix test
  update NEWS


Trivial merge