From: Joe Watkins <krakjoe@php.net>
Date: Sun, 3 Apr 2016 11:41:23 +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~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a38b2dbced1939f44ecd0f079a8fae917644822;p=php

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

9a38b2dbced1939f44ecd0f079a8fae917644822