]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Sat, 7 Jan 2017 01:49:44 +0000 (02:49 +0100)
committerAnatol Belski <ab@php.net>
Sat, 7 Jan 2017 01:49:44 +0000 (02:49 +0100)
* PHP-7.1:
  /guard is also a security flag

1  2 
win32/build/confutils.js

Simple merge