From: Michael Wallner <mike@php.net>
Date: Fri, 30 Mar 2012 12:27:02 +0000 (+0000)
Subject: reintegrate the DEV_2-client branch
X-Git-Tag: RELEASE_2_1_0_RC3~10^2^2~145
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=eebe0f3e8947ecb407451d20aef0611cfcedfdac;p=m6w6%2Fext-http

reintegrate the DEV_2-client branch
---

eebe0f3e8947ecb407451d20aef0611cfcedfdac