]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Sat, 29 Oct 2016 12:39:07 +0000 (14:39 +0200)
committerNikita Popov <nikic@php.net>
Sat, 29 Oct 2016 12:39:07 +0000 (14:39 +0200)
1  2 
Zend/zend_interfaces.c

Simple merge