]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Sat, 5 Nov 2016 22:11:42 +0000 (23:11 +0100)
committerNikita Popov <nikic@php.net>
Sat, 5 Nov 2016 22:11:42 +0000 (23:11 +0100)

Trivial merge