]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Wed, 22 Apr 2015 08:36:29 +0000 (16:36 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 22 Apr 2015 08:36:29 +0000 (16:36 +0800)

Trivial merge