From: Michael Wallner <mike@php.net>
Date: Tue, 19 Jan 2016 09:30:29 +0000 (+0100)
Subject: Merge branch 'v1.0.x'
X-Git-Tag: release-2.0.0~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=81b8154a9ff02010ac3847147516e8aa242b22aa;p=m6w6%2Fext-propro

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

81b8154a9ff02010ac3847147516e8aa242b22aa