]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Wed, 12 Oct 2016 20:46:40 +0000 (22:46 +0200)
committerNikita Popov <nikic@php.net>
Wed, 12 Oct 2016 20:46:40 +0000 (22:46 +0200)

Trivial merge