]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikic@php.net>
Wed, 21 Dec 2016 20:19:28 +0000 (21:19 +0100)
committerNikita Popov <nikic@php.net>
Wed, 21 Dec 2016 20:19:28 +0000 (21:19 +0100)
1  2 
Zend/zend_hash.c

Simple merge