]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 3 Nov 2014 19:43:51 +0000 (11:43 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 3 Nov 2014 19:43:51 +0000 (11:43 -0800)
* PHP-5.5:
  update NEWS
  Fix bug #63595 GMP memory management conflicts with other libraries using GMP


Trivial merge