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

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

24329e5286cd95cb395a2261c3b2f7c8d4c749a1