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

Trivial merge