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

Trivial merge