]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Tue, 17 Feb 2015 13:18:46 +0000 (21:18 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 17 Feb 2015 13:18:46 +0000 (21:18 +0800)

Trivial merge