]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@php.net>
Tue, 10 Mar 2015 02:44:07 +0000 (10:44 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 10 Mar 2015 02:44:07 +0000 (10:44 +0800)

Trivial merge