]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Sat, 11 Aug 2012 08:00:30 +0000 (16:00 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 11 Aug 2012 08:00:30 +0000 (16:00 +0800)

Trivial merge