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

Merge branch 'master' into phpng
---

43f53c0f481b58c3f7fa991cf1fb07346189f8df