]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Sat, 1 Sep 2012 06:27:09 +0000 (14:27 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 1 Sep 2012 06:27:09 +0000 (14:27 +0800)
commit863e7e0acbe284d5c7738fa9c601023ad5773d3f
treead17510ddf5fb7f4c24c09f368c2db440010e5b3
parente658a91b3d826ea4104b17f3a6123c1e9f3aee86
parent67d7d03f00cb3185a4d5958ab7a4b063fc33405c
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/spl/spl_array.c
NEWS
ext/spl/spl_array.c