]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3edd330 67f0770)
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)
* PHP-5.6:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.