]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Fri, 25 Nov 2016 23:31:22 +0000 (15:31 -0800)
committerStanislav Malyshev <stas@php.net>
Fri, 25 Nov 2016 23:31:22 +0000 (15:31 -0800)
* 'PHP-7.1' of git.php.net:php-src:
  Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phpt


Trivial merge