]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Thu, 21 Mar 2013 13:10:32 +0000 (21:10 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 21 Mar 2013 13:10:32 +0000 (21:10 +0800)
commit79925094c40a46a270fc079ddd6c2c92ff62c10f
tree06c69df2c9ef320294ae384500bf4159f2d518f9
parentf2383dead69d59143fee1d54de98f154d6833714
parent7dce0194c815cdc75a780b6471660042aed7bd7a
Merge branch 'PHP-5.4' into PHP-5.5
Zend/zend_API.c
Zend/zend_API.h
Zend/zend_builtin_functions.c