From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 2 Sep 2016 22:30:05 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC2~52^2~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3dc00fdfbf1418665597fd2b406d289a01f4e3f;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

f3dc00fdfbf1418665597fd2b406d289a01f4e3f