From: Xinchen Hui <laruence@php.net>
Date: Sat, 21 Mar 2015 07:56:52 +0000 (+0800)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~568
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f845cdc486c140f789aa334193931d5bd31ee23;p=php

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

5f845cdc486c140f789aa334193931d5bd31ee23