From: Anatol Belski Date: Thu, 21 May 2015 08:57:30 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5acddf898f3418f78d903d233861cdd1dd6ab6d0;p=php Merge branch 'PHP-5.6' * PHP-5.6: remove duplicated declaration, fix build --- 5acddf898f3418f78d903d233861cdd1dd6ab6d0