]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Mon, 17 Dec 2012 04:57:37 +0000 (12:57 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 17 Dec 2012 04:57:37 +0000 (12:57 +0800)

Trivial merge