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

Merge branch 'R_2_5'
---

a5e66b221dbf5a52cc770f4d7f46f05fe88784ba