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

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

21e82289eda19af138314daf04f6c79757235e61