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

Trivial merge