From: Michael Wallner <mike@php.net>
Date: Tue, 29 Sep 2015 15:24:20 +0000 (+0200)
Subject: Merge branch 'R_1_0'
X-Git-Tag: release-2.0.0RC1~9
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-propro;a=commitdiff_plain;h=e8807da06d085ec0a89950ac87210fa834f548b4

Merge branch 'R_1_0'
---

e8807da06d085ec0a89950ac87210fa834f548b4