From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 13 Jun 2017 14:17:57 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.2.0alpha2~34^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef4b2fc283ddaf9bd692015f1db6dad52171c3ce;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Use "Mac" instead of "OSX" to identify macOS in PHP_OS_FAMILY
---

ef4b2fc283ddaf9bd692015f1db6dad52171c3ce