]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@php.net>
Thu, 12 Feb 2015 03:28:30 +0000 (11:28 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 12 Feb 2015 03:28:30 +0000 (11:28 +0800)

Trivial merge