]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Thu, 5 Mar 2015 11:06:02 +0000 (19:06 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 5 Mar 2015 11:06:02 +0000 (19:06 +0800)

Trivial merge