From: Kalle Sommer Nielsen <kalle@php.net>
Date: Fri, 27 Mar 2015 14:21:52 +0000 (+0100)
Subject: Merge branch 'master' of https://git.php.net/push/php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~481
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f678519a63ac55803601c851c570611ad4f0bd6e;p=php

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

f678519a63ac55803601c851c570611ad4f0bd6e