]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Sun, 7 Aug 2016 16:38:43 +0000 (18:38 +0200)
committerNikita Popov <nikic@php.net>
Sun, 7 Aug 2016 16:38:43 +0000 (18:38 +0200)

Trivial merge