]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Wed, 27 Jul 2016 13:59:44 +0000 (15:59 +0200)
committerNikita Popov <nikic@php.net>
Wed, 27 Jul 2016 13:59:44 +0000 (15:59 +0200)

Trivial merge