]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Thu, 2 Aug 2012 14:29:43 +0000 (22:29 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 2 Aug 2012 14:29:43 +0000 (22:29 +0800)

Trivial merge