From: Michael Wallner <mike@php.net>
Date: Mon, 12 Sep 2016 06:54:16 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_RC1~31
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=0869caece2853a07711676bad8f032fa89ed82e9

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

0869caece2853a07711676bad8f032fa89ed82e9