]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorXinchen Hui <laruence@php.net>
Sun, 6 Jan 2013 02:23:51 +0000 (10:23 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 6 Jan 2013 02:23:51 +0000 (10:23 +0800)

Trivial merge