]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Sat, 28 Jul 2012 09:01:29 +0000 (17:01 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 28 Jul 2012 09:01:29 +0000 (17:01 +0800)

Trivial merge