From: Michael Wallner <mike@php.net>
Date: Tue, 8 Jul 2014 10:14:04 +0000 (+0200)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~34
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=51dcae85102bbf2ae1d2d41775d2a37f218b53aa;hp=-c

Merge branch 'R_2_0'
---

51dcae85102bbf2ae1d2d41775d2a37f218b53aa