From: Michael Wallner <mike@php.net>
Date: Fri, 20 May 2016 08:09:32 +0000 (+0200)
Subject: Merge branch 'v1.1.x'
X-Git-Tag: v2.1.0~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=63362a2ae0c2b34a1e11f57d2c4980b5d6403691;p=m6w6%2Fext-pq

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

63362a2ae0c2b34a1e11f57d2c4980b5d6403691