From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 8 Nov 2017 09:52:46 +0000 (+0300)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~1067
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=196f003937d84b8d3d393e46d3e3d31c72ab1d56;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed assertion on phpMyAdmin-4.7.5 home page
---

196f003937d84b8d3d393e46d3e3d31c72ab1d56