]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Mon, 9 Jan 2017 23:09:02 +0000 (00:09 +0100)
committerNikita Popov <nikic@php.net>
Mon, 9 Jan 2017 23:09:02 +0000 (00:09 +0100)

Trivial merge