From: Nikita Popov <nikic@php.net>
Date: Thu, 3 Mar 2016 16:14:18 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.5RC1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a01605b4bca8aa9cc5b6e3c3222745fa5f0b131;p=php

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

5a01605b4bca8aa9cc5b6e3c3222745fa5f0b131