From: Michael Wallner <mike@php.net>
Date: Thu, 12 Mar 2015 07:11:02 +0000 (+0100)
Subject: Merge branch 'R_2_3'
X-Git-Tag: RELEASE_2_4_0~2
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=333ffe4376d543204387d3cbd8e17f4a675cf3e5

Merge branch 'R_2_3'
---

333ffe4376d543204387d3cbd8e17f4a675cf3e5