]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'origin/PHP-5.4'
authorXinchen Hui <laruence@php.net>
Mon, 30 Apr 2012 04:36:06 +0000 (12:36 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 30 Apr 2012 04:36:06 +0000 (12:36 +0800)

Trivial merge