From: Michael Wallner <mike@php.net>
Date: Mon, 1 Sep 2014 09:32:32 +0000 (+0200)
Subject: Merge branch 'R_2_1'
X-Git-Tag: RELEASE_2_2_0_RC1~15^2
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=39e4972736be9924a4917b3340b7ae0651bf7a2b;hp=-c

Merge branch 'R_2_1'
---

39e4972736be9924a4917b3340b7ae0651bf7a2b