]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Fri, 11 May 2012 12:27:07 +0000 (20:27 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 11 May 2012 12:27:07 +0000 (20:27 +0800)

Trivial merge