]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Sat, 21 Jul 2012 15:27:52 +0000 (23:27 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 21 Jul 2012 15:27:52 +0000 (23:27 +0800)
commit52d8779c43ad22c5c24c471f4d52332fe7633ca2
tree691dd14ff7151f81aee569e51e4ee3e186e0ed6d
parent0c996613c0173708381f4bfcd28d2441360bc701
parentead076bac613bc69d83ab65be2efb68feada912c
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix test failed
  Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)