From: Michael Wallner <mike@php.net>
Date: Wed, 30 Sep 2015 13:05:59 +0000 (+0200)
Subject: Merge branch 'v1.0.x'
X-Git-Tag: release-2.0.0RC1~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=55c3639a82f5e3dad0bb2e913e55ba929c624e34;p=m6w6%2Fext-propro

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

55c3639a82f5e3dad0bb2e913e55ba929c624e34