]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Wed, 19 Aug 2015 10:41:46 +0000 (18:41 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 19 Aug 2015 10:41:46 +0000 (18:41 +0800)

Trivial merge