From: Andrea Faulds <ajf@ajf.me>
Date: Mon, 9 Nov 2015 23:42:12 +0000 (+0000)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~832
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7bc6361294d5edecf4f5605c810a4c36145c1d91;p=php

Merge branch 'PHP-7.0'
---

7bc6361294d5edecf4f5605c810a4c36145c1d91