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

Merge branch 'R_1_1'
---

b5bf65882debd5b1e96e08bcea688b3ae522cbeb