From: Michael Wallner <mike@php.net>
Date: Tue, 1 Sep 2015 07:38:17 +0000 (+0200)
Subject: Merge branch 'R_2_5'
X-Git-Tag: RELEASE_3_0_0_RC1~25
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=a072128f443ded05070efd21fb5eceb72e1869b8

Merge branch 'R_2_5'
---

a072128f443ded05070efd21fb5eceb72e1869b8