From: Christopher Jones <christopher.jones@oracle.com>
Date: Thu, 14 Apr 2016 05:49:52 +0000 (+1000)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~325
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d76e012cf25c2f6173419fc281c6f756a035371;p=php

Merge branch 'PHP-7.0'
---

9d76e012cf25c2f6173419fc281c6f756a035371