Merge pull request #6600 from colemanw/CRM-17038
authorcolemanw <coleman@civicrm.org>
Thu, 27 Aug 2015 15:08:02 +0000 (11:08 -0400)
committercolemanw <coleman@civicrm.org>
Thu, 27 Aug 2015 15:08:02 +0000 (11:08 -0400)
CRM-17038 - Fix custom tokens in greetings


Trivial merge