]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Thu, 10 Nov 2016 21:52:22 +0000 (22:52 +0100)
committerNikita Popov <nikic@php.net>
Thu, 10 Nov 2016 21:52:22 +0000 (22:52 +0100)

Trivial merge