From: Nikita Popov <nikic@php.net>
Date: Sat, 13 Feb 2016 16:48:17 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.4RC1~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f43fe8cb4c7d70eab536ddae50a38824a5b32af9;p=php

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

f43fe8cb4c7d70eab536ddae50a38824a5b32af9