From: Anatol Belski Date: Mon, 16 Mar 2015 07:35:10 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~658 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b48f3ecd92c4820ce835dbbf75a79c7fcb72a8d2;p=php Merge branch 'PHP-5.6' * PHP-5.6: backport af2b0669 into 5.5 --- b48f3ecd92c4820ce835dbbf75a79c7fcb72a8d2