]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Thu, 5 Jan 2017 10:38:47 +0000 (11:38 +0100)
committerNikita Popov <nikic@php.net>
Thu, 5 Jan 2017 10:38:47 +0000 (11:38 +0100)

Trivial merge