]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Sun, 4 Sep 2016 12:28:47 +0000 (14:28 +0200)
committerNikita Popov <nikic@php.net>
Sun, 4 Sep 2016 12:28:47 +0000 (14:28 +0200)

Trivial merge