From: Michael Wallner <mike@php.net>
Date: Tue, 19 Jan 2016 08:58:55 +0000 (+0100)
Subject: Merge branch 'v1.1.x'
X-Git-Tag: release-2.0.0~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=523f27ba3bdce4a8d610a94e8b3e0775a5f4238b;p=m6w6%2Fext-raphf

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

523f27ba3bdce4a8d610a94e8b3e0775a5f4238b