From: Michael Wallner <mike@php.net>
Date: Fri, 4 Apr 2014 12:14:24 +0000 (+0200)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~41
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=1ebe4d9f8e3e0d301809b9279ba428ba829b7f17;p=m6w6%2Fext-http

Merge branch 'R_2_0'

Conflicts:
	php_http.h
---

1ebe4d9f8e3e0d301809b9279ba428ba829b7f17