]> granicus.if.org Git - php/commitdiff
Merge branch 'arginfo' of https://github.com/realityking/php-src into PHP-5.4
authorXinchen Hui <laruence@php.net>
Sun, 8 Mar 2015 14:53:19 +0000 (22:53 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 8 Mar 2015 14:53:19 +0000 (22:53 +0800)

Trivial merge