]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Mon, 25 Jul 2016 20:00:11 +0000 (22:00 +0200)
committerNikita Popov <nikic@php.net>
Mon, 25 Jul 2016 20:00:11 +0000 (22:00 +0200)

Trivial merge