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

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

768d8a8ddc93afddc736df5b1442ad5b326f3c4e