]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Wed, 2 Mar 2016 12:09:50 +0000 (15:09 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 2 Mar 2016 12:09:50 +0000 (15:09 +0300)
* PHP-7.0:
  Better fix for IS_INDIRECT support in zend_hash_merge()


Trivial merge