Option.tpl whitespace cleanup
CRM-15367 - Standardize buttons for option edit screens
Merge pull request #4226 from colemanw/CRM-15367

CRM-15367 - Standardize buttons for option edit screens
CiviMailUtils.php Webtest fix
CiviMailUtils.php code comment