From: Nikita Popov <nikic@php.net>
Date: Tue, 10 Jan 2017 22:19:19 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.2RC1~93^2~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=291e3f0762cab9e9639e0594aa0ab96359ba2530;p=php

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

291e3f0762cab9e9639e0594aa0ab96359ba2530