From: Joe Watkins <krakjoe@php.net>
Date: Sat, 12 Nov 2016 17:30:41 +0000 (+0000)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.2.0alpha1~948
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc;p=php

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

a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc