From: Michael Wallner <mike@php.net>
Date: Wed, 30 Sep 2015 12:54:08 +0000 (+0200)
Subject: Merge branch 'v1.1.x'
X-Git-Tag: release-2.0.0RC1~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=7b963303fb7d67bcdeefde14eb9c0f9346ff50a4;p=m6w6%2Fext-raphf

Merge branch 'v1.1.x'
---

7b963303fb7d67bcdeefde14eb9c0f9346ff50a4