[contributions:merge] /themes/fruity comment.tpl.php fruity.info