]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Sat, 17 Sep 2016 20:57:07 +0000 (22:57 +0200)
committerNikita Popov <nikic@php.net>
Sat, 17 Sep 2016 20:57:07 +0000 (22:57 +0200)

Trivial merge