]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Sun, 21 Jul 2013 08:19:13 +0000 (16:19 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 21 Jul 2013 08:19:13 +0000 (16:19 +0800)
1  2 
Zend/zend_builtin_functions.c

Simple merge