]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Thu, 29 Dec 2016 20:18:58 +0000 (21:18 +0100)
committerNikita Popov <nikic@php.net>
Thu, 29 Dec 2016 20:18:58 +0000 (21:18 +0100)

Trivial merge