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

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

6bb2f2584faf986f1b0b764f69e760b69163f48c