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

Trivial merge