]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Thu, 22 Sep 2016 10:38:48 +0000 (12:38 +0200)
committerNikita Popov <nikic@php.net>
Thu, 22 Sep 2016 10:38:48 +0000 (12:38 +0200)

Trivial merge