]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 5 Jan 2015 03:57:29 +0000 (19:57 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 5 Jan 2015 03:57:29 +0000 (19:57 -0800)
* PHP-5.5:
  fix GD tests with no GD loaded
  Fixed typo
  GD: imagepalettetotruecolor tests


Trivial merge