]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Tue, 30 Aug 2016 11:06:38 +0000 (13:06 +0200)
committerNikita Popov <nikic@php.net>
Tue, 30 Aug 2016 11:06:38 +0000 (13:06 +0200)

Trivial merge