]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Sun, 24 Feb 2013 04:58:39 +0000 (12:58 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 24 Feb 2013 04:58:39 +0000 (12:58 +0800)
commitd24ac6953ec8ca147243363eeacc8772d265b6cc
tree2181db4b99ad20b1278a18248f75b0d3746e6ea5
parent064c62e4cf078cf08a40478dfe0e64bd51789e57
parent1b58bd39a637e9ec4ea9e95903b74aefdbd1b596
Merge branch 'PHP-5.3' into PHP-5.4

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