]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Tue, 27 Dec 2016 21:22:14 +0000 (22:22 +0100)
committerNikita Popov <nikic@php.net>
Tue, 27 Dec 2016 21:22:14 +0000 (22:22 +0100)

Trivial merge