]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Thu, 11 Aug 2016 10:20:02 +0000 (12:20 +0200)
committerNikita Popov <nikic@php.net>
Thu, 11 Aug 2016 10:20:02 +0000 (12:20 +0200)

Trivial merge