From: Michael Wallner <mike@php.net>
Date: Wed, 9 Jul 2014 12:41:03 +0000 (+0200)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~33
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=74bfc0cd7185a668af2e61c9d2a6670814825517;hp=-c

Merge branch 'R_2_0'
---

74bfc0cd7185a668af2e61c9d2a6670814825517