]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Fri, 18 Nov 2016 16:56:28 +0000 (17:56 +0100)
committerNikita Popov <nikic@php.net>
Fri, 18 Nov 2016 16:56:28 +0000 (17:56 +0100)

Trivial merge