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

Merge branch 'R_2_1'
---

0fec4ae3ad609adc395f7c5abbc6472792d03514