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

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

d844e96464961bc13e3221cac105441e134b82a6