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

Merge branch 'R_1_0'
---

260c2328b47d5dc6cacb822a31e4603310f28d5d