From: Michael Wallner <mike@php.net>
Date: Thu, 6 Nov 2014 12:07:15 +0000 (+0100)
Subject: Merge branch 'R_2_1'
X-Git-Tag: RELEASE_2_2_0_RC1~9^2~3
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=4dde50dd5e77937157350e3aba617261e074bf92

Merge branch 'R_2_1'
---

4dde50dd5e77937157350e3aba617261e074bf92