]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Wed, 23 May 2012 05:52:36 +0000 (13:52 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 23 May 2012 05:52:36 +0000 (13:52 +0800)

Trivial merge