From: Michael Wallner <mike@php.net>
Date: Tue, 1 Sep 2015 08:13:45 +0000 (+0200)
Subject: Merge branch 'R_2_5' [ci skip]
X-Git-Tag: RELEASE_3_0_0_RC1~23
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=822433ffac320a4639686cac7ec13554b009ad9f;p=m6w6%2Fext-http

Merge branch 'R_2_5' [ci skip]
---

822433ffac320a4639686cac7ec13554b009ad9f