]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 4 Jun 2014 08:11:07 +0000 (01:11 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 4 Jun 2014 08:11:07 +0000 (01:11 -0700)
* PHP-5.5:
  update news
  update NEWS
  fix gcov data with some locales (again)


Trivial merge