From: Stanislav Malyshev Date: Sun, 19 Apr 2015 02:51:22 +0000 (-0700) Subject: Merge branch 'pull-request/1238' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~221 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd56598d0d7c95098202818a3c247a29c565f161;p=php Merge branch 'pull-request/1238' * pull-request/1238: apply a patch --- dd56598d0d7c95098202818a3c247a29c565f161