From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 6 Apr 2015 15:10:34 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~376
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d77950902ed55776ecb77d000d1bf66790b19854;p=php

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

* 'master' of git.php.net:php-src:
  catch up with INF handling under VS
---

d77950902ed55776ecb77d000d1bf66790b19854