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)
commitfb94073178aaa14acc838f6f83cb2d585fdbc7f4
tree077250ecb2e04f647475bb20f08191beb721b4eb
parent36b5c108f30e8b05f1b20425ffa6d6e9fabd5800
parentf551f7d327747a4ffc2e34cc7a4be9b044f7004c
Merge pull request #6600 from colemanw/CRM-17038

CRM-17038 - Fix custom tokens in greetings