]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 10 Apr 2017 20:26:35 +0000 (22:26 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 10 Apr 2017 20:26:35 +0000 (22:26 +0200)

Trivial merge