Merge proposals dependent on lp:~zodiacsohma/armagetronad/arma_colors_to_html_codes

lp:~zodiacsohma/armagetronad/arma_colors_to_html_codes has no merge proposals.