]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Mon, 1 Oct 2012 16:31:47 +0000 (00:31 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 1 Oct 2012 16:31:47 +0000 (00:31 +0800)

Trivial merge