]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'php-src/PHP-7.2' into PHP-7.2
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 28 Nov 2017 22:37:05 +0000 (23:37 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 28 Nov 2017 22:37:05 +0000 (23:37 +0100)

Trivial merge