]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6.18
authorStanislav Malyshev <stas@php.net>
Tue, 2 Feb 2016 03:15:19 +0000 (19:15 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 2 Feb 2016 03:15:19 +0000 (19:15 -0800)
* PHP-5.5:
  fix tests
  fix NEWS
  update NEWS


Trivial merge