]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Sun, 7 Aug 2016 16:50:34 +0000 (18:50 +0200)
committerNikita Popov <nikic@php.net>
Sun, 7 Aug 2016 16:50:34 +0000 (18:50 +0200)

Trivial merge