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

Merge branch 'master' into phpng
---

d3db974f7da60666fc07c89059c4a6e188ac407c