]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 10 Mar 2016 10:34:25 +0000 (13:34 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 10 Mar 2016 10:34:25 +0000 (13:34 +0300)
* 'master' of git.php.net:php-src:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)


Trivial merge