From: Xinchen Hui <laruence@php.net>
Date: Fri, 13 Mar 2015 16:41:29 +0000 (+0800)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~670
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f97b000430932c8e963f4423785019c5fbb70b0c;p=php

Merge branch 'master' of https://git.php.net/repository/php-src
---

f97b000430932c8e963f4423785019c5fbb70b0c