]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Sat, 21 Jul 2012 14:46:14 +0000 (22:46 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 21 Jul 2012 14:46:14 +0000 (22:46 +0800)
* PHP-5.4:
  Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)

1  2 
ext/spl/spl_iterators.c

Simple merge