]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Fri, 19 Oct 2012 03:24:15 +0000 (11:24 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 19 Oct 2012 03:24:15 +0000 (11:24 +0800)

Trivial merge