]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 11 Jun 2014 06:20:07 +0000 (23:20 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 11 Jun 2014 06:20:07 +0000 (23:20 -0700)
* PHP-5.5:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next

1  2 
ext/spl/spl_array.c

Simple merge