]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Fri, 22 Jul 2016 16:21:10 +0000 (18:21 +0200)
committerNikita Popov <nikic@php.net>
Fri, 22 Jul 2016 16:21:10 +0000 (18:21 +0200)

Trivial merge