From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 10 May 2016 19:40:09 +0000 (-0400)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c49a9fa71a9331d38ba72cc143bb96a920a2944;p=php

Merge branch 'PHP-7.0'
---

1c49a9fa71a9331d38ba72cc143bb96a920a2944