]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Sun, 2 Sep 2012 08:53:31 +0000 (16:53 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 2 Sep 2012 08:53:31 +0000 (16:53 +0800)

Trivial merge