]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Wed, 25 Dec 2013 07:35:02 +0000 (15:35 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 25 Dec 2013 07:35:02 +0000 (15:35 +0800)

Trivial merge