]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Tue, 13 Jan 2015 15:39:16 +0000 (23:39 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 13 Jan 2015 15:39:16 +0000 (23:39 +0800)

Trivial merge