]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Sun, 15 Feb 2015 15:00:41 +0000 (23:00 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 15 Feb 2015 15:00:41 +0000 (23:00 +0800)

Trivial merge