From: Michael Wallner <mike@php.net>
Date: Mon, 2 Mar 2015 14:09:59 +0000 (+0100)
Subject: Merge branch 'R_2_3'
X-Git-Tag: RELEASE_2_4_0~10
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=42655467c664b1d0f1e8225b42bd7cd4bd5be032;hp=--cc

Merge branch 'R_2_3'
---

42655467c664b1d0f1e8225b42bd7cd4bd5be032