From: Michael Wallner <mike@php.net>
Date: Tue, 24 May 2016 15:26:31 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_BETA1~18
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=ab1eba311be2f8aab98eed7a6164e79d69b402b2;hp=ab1eba311be2f8aab98eed7a6164e79d69b402b2

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