]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Thu, 18 Oct 2012 15:33:25 +0000 (23:33 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 18 Oct 2012 15:33:25 +0000 (23:33 +0800)

Trivial merge