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

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

b00e81afafdb7bc6e76b6ef4d283f5b5fb8feec7