From: Michael Wallner <mike@php.net>
Date: Wed, 7 Sep 2016 06:01:09 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_BETA2~1
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=faf7a7899fa8ffb24f8105a921f359d6b97ec34e;hp=faf7a7899fa8ffb24f8105a921f359d6b97ec34e;ds=sidebyside

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