From: Joe Watkins <krakjoe@php.net>
Date: Mon, 11 Apr 2016 07:04:14 +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~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=707941413d871f09fdfcdd833d87f86dcf884f48;p=php

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

707941413d871f09fdfcdd833d87f86dcf884f48