From: Michael Wallner <mike@php.net>
Date: Mon, 1 Sep 2014 09:03:42 +0000 (+0200)
Subject: Merge branch 'R_2_1'
X-Git-Tag: RELEASE_2_2_0_RC1~15^2~1
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=f155d6d142f3320ec0d327a993773d453e25ddc3

Merge branch 'R_2_1'
---

f155d6d142f3320ec0d327a993773d453e25ddc3