From: Michael Wallner <mike@php.net>
Date: Wed, 14 Sep 2016 06:07:59 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_RC1~30
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=c4f87eca8a03263a6506ae2ddc56f76b6b988c51;hp=c4f87eca8a03263a6506ae2ddc56f76b6b988c51

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