]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Wed, 25 Mar 2015 05:54:49 +0000 (13:54 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 25 Mar 2015 05:54:49 +0000 (13:54 +0800)

Trivial merge