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

Trivial merge