]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Sun, 6 May 2012 12:32:15 +0000 (20:32 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 6 May 2012 12:32:15 +0000 (20:32 +0800)

Trivial merge