From: Derick Rethans Date: Tue, 28 Apr 2015 23:28:04 +0000 (+0100) Subject: Merge branch 'PHP-5.5' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~121 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66c7eea659e81d4ba2625512e1cacd7edf343d28;p=php Merge branch 'PHP-5.5' --- 66c7eea659e81d4ba2625512e1cacd7edf343d28