From: Michael Wallner <mike@php.net>
Date: Tue, 19 Jan 2016 12:59:09 +0000 (+0100)
Subject: Merge branch 'v1.0.x'
X-Git-Tag: v2.0.0~5
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=commitdiff_plain;h=9e4e6b948aa03c04e66e808efa6a3522b92449d8;hp=9e4e6b948aa03c04e66e808efa6a3522b92449d8;ds=sidebyside

Merge branch 'v1.0.x'
---