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

Merge branch 'R_1_1'
---

52ccda73de7175210ca79203175a083969f9ce77