From: Michael Wallner <mike@php.net>
Date: Fri, 17 Jan 2014 15:08:09 +0000 (+0100)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~46
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=3019d90e130276f40f4172e3e5080049a3dd4f78;p=m6w6%2Fext-http

Merge branch 'R_2_0'
---

3019d90e130276f40f4172e3e5080049a3dd4f78