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

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

0ef55616b66a3f554d89142944a9f684f3e78d65