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

Trivial merge