]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorXinchen Hui <laruence@php.net>
Thu, 4 Apr 2013 06:49:58 +0000 (14:49 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 4 Apr 2013 06:49:58 +0000 (14:49 +0800)

Trivial merge