diff options
author | Anatol Belski <ab@php.net> | 2015-02-22 16:26:52 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2015-02-22 16:26:52 +0100 |
commit | e656932d0e6b1378f1a5a1181d4ddf79ed651d6b (patch) | |
tree | 6602f90650c1e0876acfd589cada159fcd88c76b /ext/json/json.c | |
parent | 3cf2b7cc2b26b45699fc998dc57fee103bbf09a2 (diff) | |
parent | 68afd75ecdd764d75217d7c6362a736588cb7ca4 (diff) | |
download | php-git-e656932d0e6b1378f1a5a1181d4ddf79ed651d6b.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix Win32 SSPI initialization for digest authentication in cURL
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions