]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Sat, 31 Dec 2016 12:34:09 +0000 (13:34 +0100)
committerNikita Popov <nikic@php.net>
Sat, 31 Dec 2016 12:34:09 +0000 (13:34 +0100)

Trivial merge