From: Xinchen Hui <laruence@php.net>
Date: Wed, 6 May 2015 02:51:52 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55d94a453243cafc2292920e9c91bd2bc551f2be;p=php

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

55d94a453243cafc2292920e9c91bd2bc551f2be