]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
authorXinchen Hui <laruence@php.net>
Fri, 25 Jul 2014 02:52:46 +0000 (10:52 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 25 Jul 2014 02:52:46 +0000 (10:52 +0800)

Trivial merge