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

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

7017fcdb38d4c56b7bf5f4c21ad8753356bc606b