From: Michael Wallner <mike@php.net>
Date: Tue, 9 Sep 2014 08:00:01 +0000 (+0200)
Subject: Merge branch 'R_2_1'
X-Git-Tag: RELEASE_2_2_0_RC1~11^2~4
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=8e1a8dc794800b079df0ee108fc72b9bd8ddfdee

Merge branch 'R_2_1'
---

8e1a8dc794800b079df0ee108fc72b9bd8ddfdee