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

Merge branch 'R_2_1'
---

674f3eeb338dd06b8dbe0325582942a9ba6f769d