From: Michael Wallner <mike@php.net>
Date: Sun, 8 Feb 2015 15:23:13 +0000 (+0100)
Subject: Merge branch 'master' into phpng
X-Git-Tag: RELEASE_3_0_0_RC1~64
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=be9585b914061f84c5d5939673d29ecc048ab1d7;hp=be9585b914061f84c5d5939673d29ecc048ab1d7;p=m6w6%2Fext-http

Merge branch 'master' into phpng

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
---