From: Michael Wallner <mike@php.net>
Date: Wed, 5 Oct 2016 06:23:19 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0~11
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;ds=sidebyside;h=650b04d44f7ab3a5325865d9ffa10a5245ac7eca;hp=-c;p=m6w6%2Fext-http

Merge branch 'v2.6.x'
---

650b04d44f7ab3a5325865d9ffa10a5245ac7eca