From: Joe Watkins <krakjoe@php.net>
Date: Mon, 11 Apr 2016 07:03:56 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/php/php-src
X-Git-Tag: php-7.1.0alpha1~336
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00d8d9f227234a0712feeb5daf7b31e8233daf8a;p=php

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

00d8d9f227234a0712feeb5daf7b31e8233daf8a