From: Joe Watkins <krakjoe@php.net>
Date: Tue, 7 Jun 2016 12:12:34 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/php/php-src
X-Git-Tag: php-7.1.0alpha3~42^2~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cab1510360c6ea7c82c2d3bc03ac59d8ded31524;p=php

Merge branch 'master' of https://github.com/php/php-src
---

cab1510360c6ea7c82c2d3bc03ac59d8ded31524