]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Thu, 20 Oct 2016 11:26:34 +0000 (13:26 +0200)
committerNikita Popov <nikic@php.net>
Thu, 20 Oct 2016 11:26:34 +0000 (13:26 +0200)
1  2 
ext/standard/array.c

Simple merge