From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 2 Mar 2016 12:09:50 +0000 (+0300)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~539
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=701edb8c82439ed5986be0718a5246cd37452f96;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Better fix for IS_INDIRECT support in zend_hash_merge()
---

701edb8c82439ed5986be0718a5246cd37452f96