From: Michael Wallner <mike@php.net>
Date: Fri, 12 Jun 2015 07:32:34 +0000 (+0200)
Subject: Merge branch 'master' into phpng
X-Git-Tag: release-2.0.0RC1~19
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a9a95e13578c3b57be0e60898e13babd001d2698;p=m6w6%2Fext-raphf

Merge branch 'master' into phpng
---

a9a95e13578c3b57be0e60898e13babd001d2698