]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6.19
authorStanislav Malyshev <stas@php.net>
Wed, 2 Mar 2016 06:55:49 +0000 (22:55 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 2 Mar 2016 06:55:49 +0000 (22:55 -0800)
* PHP-5.5:
  fix test file
  Fix version
  Update NEWS


Trivial merge