]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Sun, 12 Apr 2015 04:12:38 +0000 (12:12 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 12 Apr 2015 04:12:38 +0000 (12:12 +0800)

Trivial merge