]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Thu, 28 Jul 2016 16:52:19 +0000 (18:52 +0200)
committerNikita Popov <nikic@php.net>
Thu, 28 Jul 2016 16:52:19 +0000 (18:52 +0200)

Trivial merge