]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Mon, 17 Sep 2012 03:21:14 +0000 (11:21 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 17 Sep 2012 03:21:14 +0000 (11:21 +0800)

Trivial merge