]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Fri, 7 Oct 2016 23:10:56 +0000 (01:10 +0200)
committerNikita Popov <nikic@php.net>
Fri, 7 Oct 2016 23:10:56 +0000 (01:10 +0200)

Trivial merge