]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 27 Oct 2014 06:53:54 +0000 (07:53 +0100)
committerRemi Collet <remi@php.net>
Mon, 27 Oct 2014 06:53:54 +0000 (07:53 +0100)
commit2233625e02374339a7d10876b353c158fa39a5f9
tree4ffe5cc0f560030c5fbeeb79bbe8b72a2ade9eed
parentc8e1fae17f215a71ffddf834ef8ca409dfd8e50b
parentcc91072f0ef69b5884f23eb758ef6e12e8858034
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fix bug #63595 GMP memory management conflicts with other libraries using GMP

Conflicts:
ext/gmp/gmp.c
ext/gmp/gmp.c