From: Michael Wallner <mike@php.net>
Date: Thu, 3 Dec 2015 09:29:32 +0000 (+0100)
Subject: Merge branch 'v1.0.x'
X-Git-Tag: release-2.0.0RC1~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=fdab445e81832006aa78396eee5832383e48db4d;p=m6w6%2Fext-propro

Merge branch 'v1.0.x'
---

fdab445e81832006aa78396eee5832383e48db4d