]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Wed, 9 Jul 2014 10:35:13 +0000 (18:35 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 9 Jul 2014 10:35:13 +0000 (18:35 +0800)

Trivial merge