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

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