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

Merge branch 'R_2_0'
---

2c5b3135ab3e8bd0f0cd479b8182fccdd653ed4e