]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Tue, 1 Jan 2013 08:31:06 +0000 (16:31 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 1 Jan 2013 08:31:06 +0000 (16:31 +0800)

Trivial merge