From: Michael Wallner <mike@php.net>
Date: Sun, 1 Mar 2015 13:30:47 +0000 (+0100)
Subject: Merge branch 'R_2_3'
X-Git-Tag: RELEASE_2_4_0~13
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=326a999f0b7c0b9d7a2f170dcf5461c8601d6b8c

Merge branch 'R_2_3'
---

326a999f0b7c0b9d7a2f170dcf5461c8601d6b8c