]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Mon, 5 Dec 2016 19:41:21 +0000 (20:41 +0100)
committerNikita Popov <nikic@php.net>
Mon, 5 Dec 2016 19:41:21 +0000 (20:41 +0100)

Trivial merge