Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Sun, 8 Feb 2015 15:23:13 +0000 (16:23 +0100)
committerMichael Wallner <mike@php.net>
Sun, 8 Feb 2015 20:44:03 +0000 (21:44 +0100)
Conflicts:
php_http_client.c
php_http_client.h
php_http_client_curl.c
php_http_env_response.c
php_http_info.c
php_http_message.c
php_http_object.c
php_http_object.h
php_http_url.c
php_http_url.h


No differences found