From: Michael Wallner <mike@php.net>
Date: Tue, 1 Sep 2015 09:06:18 +0000 (+0200)
Subject: Merge branch 'R_1_1'
X-Git-Tag: release-2.0.0RC1~12
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a5a1d3a4fd8f9262cac759c3e658ff6129696b0d;p=m6w6%2Fext-raphf

Merge branch 'R_1_1'
---

a5a1d3a4fd8f9262cac759c3e658ff6129696b0d