From: Xinchen Hui Date: Mon, 10 Nov 2014 05:51:01 +0000 (+0800) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~130^2~34^2~4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ae9399e400e07c5ade6f39f9419b2ad598c3e74;p=php Merge branch 'PHP-5.6' Conflicts: Zend/zend_execute_API.c --- 3ae9399e400e07c5ade6f39f9419b2ad598c3e74