From: Michael Wallner <mike@php.net>
Date: Tue, 21 Jun 2016 07:09:14 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_BETA1~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=7214e1aef4efce10bcc509d2a741acef88d28781;hp=7214e1aef4efce10bcc509d2a741acef88d28781;p=m6w6%2Fext-http

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