]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Sat, 13 Feb 2016 16:48:58 +0000 (17:48 +0100)
committerNikita Popov <nikic@php.net>
Sat, 13 Feb 2016 16:48:58 +0000 (17:48 +0100)
1  2 
ext/standard/array.c
ext/standard/string.c

Simple merge
Simple merge