From: Anatol Belski <ab@php.net>
Date: Thu, 27 Oct 2016 20:36:00 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC6~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f12d852ecda34caedebad0357e045d4d0774c16;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  use rather the nmake var as it's evaluated on every run
---

3f12d852ecda34caedebad0357e045d4d0774c16