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

Merge branch 'R_2_1'
---

e7e1fe60a6bd2a521767d87e6d21920fcdad6c1d