From: Michael Wallner <mike@php.net>
Date: Thu, 3 Dec 2015 09:30:47 +0000 (+0100)
Subject: Merge branch 'v1.1.x'
X-Git-Tag: release-2.0.0RC1~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a3193b716962b6be984a1b62823bafa771ab6354;hp=--cc;p=m6w6%2Fext-raphf

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

a3193b716962b6be984a1b62823bafa771ab6354