From: Michael Wallner <mike@php.net>
Date: Thu, 10 Jul 2014 11:08:02 +0000 (+0200)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~26
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=beb3af0516cb26bcc6e9c77876b333dcec51c44f;p=m6w6%2Fext-http

Merge branch 'R_2_0'
---

beb3af0516cb26bcc6e9c77876b333dcec51c44f