From: Christopher Jones <christopher.jones@oracle.com>
Date: Tue, 15 Sep 2015 02:17:00 +0000 (+1000)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~1167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=855f6146962c0fee8975fc3d61103b45d51f674c;p=php

Merge branch 'PHP-7.0'
---

855f6146962c0fee8975fc3d61103b45d51f674c