]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorXinchen Hui <laruence@php.net>
Tue, 5 Mar 2013 08:57:37 +0000 (16:57 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 5 Mar 2013 08:57:37 +0000 (16:57 +0800)

Trivial merge