Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 11 Apr 2017 09:37:03 +0000 (11:37 +0200)
committerAnatol Belski <ab@php.net>
Tue, 11 Apr 2017 09:37:03 +0000 (11:37 +0200)
* PHP-7.0:
  fix re2c version comparison

1  2 
win32/build/confutils.js

Simple merge