]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Thu, 10 Mar 2016 08:36:32 +0000 (09:36 +0100)
committerAnatol Belski <ab@php.net>
Thu, 10 Mar 2016 08:36:32 +0000 (09:36 +0100)
* PHP-7.0:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)


Trivial merge