]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAndrey Hristov <andrey@php.net>
Mon, 12 Dec 2016 19:17:25 +0000 (21:17 +0200)
committerAndrey Hristov <andrey@php.net>
Mon, 12 Dec 2016 19:17:25 +0000 (21:17 +0200)

Trivial merge