]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Mon, 26 May 2014 07:40:57 +0000 (15:40 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 26 May 2014 07:40:57 +0000 (15:40 +0800)

Trivial merge