]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Sun, 1 Jan 2017 11:17:01 +0000 (12:17 +0100)
committerNikita Popov <nikic@php.net>
Sun, 1 Jan 2017 11:17:01 +0000 (12:17 +0100)

Trivial merge