From: Michael Wallner <mike@php.net>
Date: Tue, 17 May 2016 10:14:07 +0000 (+0200)
Subject: Merge branch 'v1.1.x'
X-Git-Tag: v2.1.0~7
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b9f66d2b7378c40f85111ef57e9b0922789f77df;p=m6w6%2Fext-pq

Merge branch 'v1.1.x'
---

b9f66d2b7378c40f85111ef57e9b0922789f77df