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

Merge branch 'R_2_0'
---

b462e5cd5463c8c28e7d130178c0535e07127b5c