From: Michael Wallner <mike@php.net>
Date: Wed, 1 Jun 2016 07:30:42 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_BETA1~13
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=74e7358add4c74d212b91d23e8600ef3c10d081e

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

74e7358add4c74d212b91d23e8600ef3c10d081e