From: Christoph M. Becker <cmb@php.net>
Date: Thu, 9 Jun 2016 13:45:54 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha3~42^2~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74c06a64f05ad6364a9aaef2d9e0d64304047539;p=php

Merge branch 'PHP-7.0'
---

74c06a64f05ad6364a9aaef2d9e0d64304047539