From: Kalle Sommer Nielsen <kalle@php.net>
Date: Wed, 20 May 2015 14:15:40 +0000 (+0200)
Subject: Merge branch 'master' of https://git.php.net/push/php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e60c1196950f68bc500ada3b802ec9b5691e6649;p=php

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

e60c1196950f68bc500ada3b802ec9b5691e6649