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

Trivial merge