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

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

9841e1083e609ada4257bc519cfb33fd463f1824