]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Sat, 30 Jul 2016 14:08:44 +0000 (16:08 +0200)
committerNikita Popov <nikic@php.net>
Sat, 30 Jul 2016 14:08:44 +0000 (16:08 +0200)

Trivial merge