From: Joe Watkins <krakjoe@php.net>
Date: Thu, 31 Mar 2016 11:40:15 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
X-Git-Tag: php-7.0.6RC1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b13206aa9d494af2cf4bde4047250405d5bbfd2;p=php

Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
---

3b13206aa9d494af2cf4bde4047250405d5bbfd2