From: Joe Watkins <krakjoe@php.net>
Date: Tue, 25 Jul 2017 05:35:49 +0000 (+0100)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~1796
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5718c6e66012c96686c9f4dba0746cca9db8426b;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix ext/sodium display in phpinfo()
---

5718c6e66012c96686c9f4dba0746cca9db8426b