From: Nikita Popov Date: Tue, 12 May 2015 13:09:25 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~100 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6b986b4e79c8b56c591a50e6e181f5f2b217eaf;p=php Merge branch 'PHP-5.6' Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h --- c6b986b4e79c8b56c591a50e6e181f5f2b217eaf