]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Sat, 13 Aug 2016 19:44:00 +0000 (21:44 +0200)
committerNikita Popov <nikic@php.net>
Sat, 13 Aug 2016 19:44:00 +0000 (21:44 +0200)

Trivial merge