]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Tue, 15 Jan 2013 07:33:26 +0000 (15:33 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 15 Jan 2013 07:33:26 +0000 (15:33 +0800)

Trivial merge