From: Anatol Belski Date: Fri, 25 Apr 2014 22:17:09 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~339 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5dbe7c98e43f9347fd970e9258af41492a0f96dc;p=php Merge branch 'PHP-5.6' * PHP-5.6: removed /EHa as __try/__catch syntax is used anyway fix ZEND_DEBUG usage fix CFLAGS_PHPDBGS and some formatting --- 5dbe7c98e43f9347fd970e9258af41492a0f96dc