]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Thu, 10 Mar 2016 08:35:55 +0000 (09:35 +0100)
committerAnatol Belski <ab@php.net>
Thu, 10 Mar 2016 08:35:55 +0000 (09:35 +0100)
commit4d4c6cf14ee855039f6dafcdcd14c32124963461
tree2909cc36b23fa0c40a8dfbee925a8d7d639320d0
parent3edd33083c59fcbded55a272abee18ae2946d9ce
parent67f0770036f866f6f0dadc044cdc8f94a5b9f030
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)