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

Merge branch 'master' into phpng
---