From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 10 Mar 2016 10:34:25 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.1.0alpha1~499
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1868b00cdeb7880a8372727da66aa30d94dc765;p=php

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

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

c1868b00cdeb7880a8372727da66aa30d94dc765