]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Thu, 26 Jul 2012 04:44:51 +0000 (12:44 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 26 Jul 2012 04:44:51 +0000 (12:44 +0800)

Trivial merge