From: Andrea Faulds <ajf@ajf.me>
Date: Fri, 27 Nov 2015 15:20:25 +0000 (+0000)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha2~40^2~26^2~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d120006bfd192943157a5720d1d664a3e14ed508;p=php

Merge branch 'PHP-7.0'
---

d120006bfd192943157a5720d1d664a3e14ed508