From: Michael Wallner <mike@php.net>
Date: Thu, 16 Oct 2014 07:20:05 +0000 (+0200)
Subject: Merge branch 'R_2_1'
X-Git-Tag: RELEASE_2_2_0_RC1~9^2~26
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=07436695bedb3a99ad39bb2fcba7ca0d27eaaedd

Merge branch 'R_2_1'
---

07436695bedb3a99ad39bb2fcba7ca0d27eaaedd