From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 10 Mar 2016 10:34:41 +0000 (+0300)
Subject: Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
X-Git-Tag: php-7.0.5RC1~10^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99c44458da7f60af017f233a1e9d0b3f54efcdb4;p=php

Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:php-src:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
---

99c44458da7f60af017f233a1e9d0b3f54efcdb4