From: Christopher Jones <christopher.jones@oracle.com>
Date: Fri, 6 Nov 2015 15:25:18 +0000 (+1100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~858
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69613a7ac36b9d47daaa19fa79c511937feb8d05;p=php

Merge branch 'PHP-7.0'
---

69613a7ac36b9d47daaa19fa79c511937feb8d05