From: Joe Watkins <krakjoe@php.net>
Date: Sun, 13 Nov 2016 05:40:49 +0000 (+0000)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.2.0alpha1~941
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54fbc2727066eaa2e5311757e7f7b121b3db5d1a;p=php

Merge branch 'master' of git.php.net:/php-src
---

54fbc2727066eaa2e5311757e7f7b121b3db5d1a