From: Letargie <valentin@famillecollet.com>
Date: Wed, 26 Sep 2018 09:41:50 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/php/php-src into feature-getcolumnmeta
X-Git-Tag: php-7.4.0alpha1~1803^2~4^2^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f185ab7daf4e8235bf4b9e405e4bf91f3764bfcd;p=php

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

f185ab7daf4e8235bf4b9e405e4bf91f3764bfcd