From: Xinchen Hui Date: Thu, 14 Jan 2016 06:49:34 +0000 (+0800) Subject: Merge branch 'PHP-7.0' X-Git-Tag: php-7.1.0alpha1~617^2~58 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5449095c4fdf49246d3b85ac46ae42832ab1f291;p=php Merge branch 'PHP-7.0' * PHP-7.0: Fixed macro name --- 5449095c4fdf49246d3b85ac46ae42832ab1f291