From: Christopher Jones <christopher.jones@oracle.com>
Date: Thu, 7 Jul 2016 01:52:39 +0000 (+1000)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0beta1~152^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fae6407314b13aa0b10afc79dfc461426cb70fb9;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

fae6407314b13aa0b10afc79dfc461426cb70fb9