]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Thu, 5 Feb 2015 08:33:29 +0000 (16:33 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 5 Feb 2015 08:33:29 +0000 (16:33 +0800)

Trivial merge