From: Andrea Faulds <ajf@ajf.me>
Date: Fri, 8 Jan 2016 17:21:59 +0000 (+0000)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~617^2~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6ed53e011bee5ebb681e5a13db31ee7f08ef3d2;p=php

Merge branch 'PHP-7.0'
---

e6ed53e011bee5ebb681e5a13db31ee7f08ef3d2