Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Wed, 18 Feb 2015 09:33:35 +0000 (10:33 +0100)
committerMichael Wallner <mike@php.net>
Wed, 18 Feb 2015 10:26:54 +0000 (11:26 +0100)
Conflicts:
package.xml
php_http_client_curl.c
php_http_env.c
php_http_env_response.c
php_http_header_parser.c
php_http_message.c
php_http_message_body.c
php_http_message_parser.c
php_http_misc.c
php_http_strlist.c
php_http_url.h
tests/info.phpt


No differences found