]> 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, 25 Nov 2012 08:19:58 +0000 (16:19 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 25 Nov 2012 08:19:58 +0000 (16:19 +0800)

Trivial merge