From: Nikita Popov <nikic@php.net>
Date: Tue, 30 Aug 2016 11:44:59 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC1~16^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c12a5f0a87f1524bf7dae7ef0eca2878b7b9fdc;p=php

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

2c12a5f0a87f1524bf7dae7ef0eca2878b7b9fdc