From: Xinchen Hui Date: Tue, 31 May 2016 08:56:12 +0000 (+0800) Subject: Merge branch 'PHP-7.0' X-Git-Tag: php-7.1.0alpha1~63 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5717faa1e588f2060927e94fb61826a8a7a16061;p=php Merge branch 'PHP-7.0' * PHP-7.0: Fixed test (keyword is local related) --- 5717faa1e588f2060927e94fb61826a8a7a16061