From: Michael Wallner <mike@php.net>
Date: Fri, 4 Dec 2015 14:17:48 +0000 (+0100)
Subject: Merge branch 'master' into phpng
X-Git-Tag: v2.0.0RC1~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=1e2615005272bb2347820bccb38c94b9caccafb8;p=m6w6%2Fext-pq

Merge branch 'master' into phpng
---

1e2615005272bb2347820bccb38c94b9caccafb8