]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Tue, 27 Sep 2016 17:49:01 +0000 (19:49 +0200)
committerNikita Popov <nikic@php.net>
Tue, 27 Sep 2016 17:49:01 +0000 (19:49 +0200)
1  2 
Zend/zend_hash.c

Simple merge