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

Merge branch 'R_2_0'

Conflicts:
	php_http.h
---

a92f3562e87cae473417b4a2c82001ed2a93951d