Merge pull request #2013 from kenwest/CRM-13690-B
authorKurund Jalmi <kurund@civicrm.org>
Mon, 18 Nov 2013 10:58:33 +0000 (02:58 -0800)
committerKurund Jalmi <kurund@civicrm.org>
Mon, 18 Nov 2013 10:58:33 +0000 (02:58 -0800)
CRM-13690 - CiviMail - prevent html2text treating mailing tokens as rela...


Trivial merge