]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Mon, 2 Nov 2015 02:55:05 +0000 (10:55 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 2 Nov 2015 02:55:05 +0000 (10:55 +0800)

Trivial merge