From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 31 Aug 2016 12:54:51 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb78ea9cc32d5c29a5425f1e4fba58ae4ae4e2fe;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

cb78ea9cc32d5c29a5425f1e4fba58ae4ae4e2fe