From: Michael Wallner <mike@php.net>
Date: Sat, 7 Feb 2015 11:30:04 +0000 (+0100)
Subject: Merge branch 'R_2_2'
X-Git-Tag: RELEASE_2_3_0_RC1~48
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=90b581e9c564acde783926e412d7c5d737c4cbe4

Merge branch 'R_2_2'
---

90b581e9c564acde783926e412d7c5d737c4cbe4