From: Stanislav Malyshev <stas@php.net>
Date: Fri, 25 Nov 2016 23:31:22 +0000 (-0800)
Subject: Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
X-Git-Tag: php-7.1.1RC1~190
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffb65ba833a2d999dd2a0771ebd8aac672271a26;p=php

Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:php-src:
  Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phpt
---

ffb65ba833a2d999dd2a0771ebd8aac672271a26