fix #65070, bgcolor does not use the same format as the input image with imagerotate
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
fix #65070, bgcolor does not use the same format as the input image with imagerotate
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix #65070, bgcolor does not use the same format as the input image with imagerotate
  fix #65070, bgcolor does not use the same format as the input image with imagerotate
  Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
  Change the search in get_status_string() to correctly handle unknown codes.
  Update git rules (5.5 is stable, 5.3 sec only)
  skip test for bug #64936 when tokenizer not built
  Bump version
  Update credits
  Merge NEWS from PHP 5.4 branch
  Reorder NEWS for PHP 5.5.0 final

Conflicts:
	configure.in
	ext/gd/libgd/gd_interpolation.c
	main/php_version.h
Merge branch 'master' of git.php.net:php-src