]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Thu, 12 Apr 2012 16:12:40 +0000 (00:12 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 12 Apr 2012 16:12:40 +0000 (00:12 +0800)

Trivial merge