]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Tue, 23 Oct 2012 09:29:28 +0000 (17:29 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 23 Oct 2012 09:29:28 +0000 (17:29 +0800)

Trivial merge