]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorXinchen Hui <laruence@php.net>
Mon, 1 Apr 2013 11:16:44 +0000 (19:16 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 1 Apr 2013 11:16:44 +0000 (19:16 +0800)

Trivial merge