]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 16 Feb 2017 16:00:21 +0000 (17:00 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 16 Feb 2017 16:00:21 +0000 (17:00 +0100)
1  2 
ext/spl/php_spl.c

Simple merge