From: Michael Wallner <mike@php.net>
Date: Tue, 22 Apr 2014 10:18:44 +0000 (+0200)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~38
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=5a7615a3e3b5c56471b19941332ba18830778bfb

Merge branch 'R_2_0'
---

5a7615a3e3b5c56471b19941332ba18830778bfb