]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorXinchen Hui <laruence@php.net>
Sun, 25 Nov 2012 08:20:30 +0000 (16:20 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 25 Nov 2012 08:20:30 +0000 (16:20 +0800)

Trivial merge