]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Sat, 15 Sep 2012 03:51:48 +0000 (11:51 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 15 Sep 2012 03:51:48 +0000 (11:51 +0800)

Trivial merge