]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorXinchen Hui <laruence@php.net>
Tue, 22 Jan 2013 09:00:15 +0000 (17:00 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 22 Jan 2013 09:00:15 +0000 (17:00 +0800)

Trivial merge