From: Joe Watkins <krakjoe@php.net>
Date: Fri, 30 Sep 2016 06:23:19 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/php/php-src
X-Git-Tag: php-7.2.0alpha1~1232
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ee842b0ea0d94035fe584ca8a3213902bf663b2;p=php

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

8ee842b0ea0d94035fe584ca8a3213902bf663b2