From: Michael Wallner <mike@php.net>
Date: Thu, 10 Jul 2014 11:10:28 +0000 (+0200)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~25
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=7d5abf6683cab5202710d5e89cd961730f945dcf

Merge branch 'R_2_0'
---

7d5abf6683cab5202710d5e89cd961730f945dcf