]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Mon, 10 Dec 2012 10:35:04 +0000 (18:35 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 10 Dec 2012 10:35:04 +0000 (18:35 +0800)

Trivial merge