From: Christopher Jones <sixd@php.net>
Date: Mon, 18 Apr 2016 01:16:35 +0000 (+1000)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~306
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=230f9bf5128e27568b8b12481e0fdf981f87ea4d;p=php

Merge branch 'PHP-7.0'
---

230f9bf5128e27568b8b12481e0fdf981f87ea4d