Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Sat, 3 Oct 2015 08:46:32 +0000 (10:46 +0200)
committerAnatol Belski <ab@php.net>
Sat, 3 Oct 2015 08:46:32 +0000 (10:46 +0200)
* PHP-7.0:
  fix win10 support


Trivial merge