]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorXinchen Hui <laruence@php.net>
Wed, 21 Nov 2012 04:31:16 +0000 (12:31 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 21 Nov 2012 04:31:16 +0000 (12:31 +0800)

Trivial merge