]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
authorDmitry Stogov <dmitry@zend.com>
Thu, 10 Mar 2016 10:34:41 +0000 (13:34 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 10 Mar 2016 10:34:41 +0000 (13:34 +0300)
commit99c44458da7f60af017f233a1e9d0b3f54efcdb4
treed5cbc87031b8331fb2c7a0c85a711069d78e85a8
parentf8506c062f8c4f72e12f20487bbb8c453602e5e7
parent4d4c6cf14ee855039f6dafcdcd14c32124963461
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)