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

Merge branch 'PHP-7.0'
---

640b726b02b8ff08421c2787302e3d6151748f62