Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sat, 29 Oct 2016 15:57:33 +0000 (17:57 +0200)
committerAnatol Belski <ab@php.net>
Sat, 29 Oct 2016 15:57:33 +0000 (17:57 +0200)
* PHP-7.0:
  fix condition

1  2 
win32/build/confutils.js

Simple merge