]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@php.net>
Wed, 11 Mar 2015 00:20:03 +0000 (08:20 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 11 Mar 2015 00:20:03 +0000 (08:20 +0800)

Trivial merge