From: Michael Wallner <mike@php.net>
Date: Wed, 9 Jul 2014 18:34:04 +0000 (+0200)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~27
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=1d87e15edcbcf4b16c5a1aa80ce69229eedb3468

Merge branch 'R_2_0'
---

1d87e15edcbcf4b16c5a1aa80ce69229eedb3468