From: colemanw <coleman@civicrm.org>
Date: Thu, 27 Aug 2015 15:08:02 +0000 (-0400)
Subject: Merge pull request #6600 from colemanw/CRM-17038
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fb94073178aaa14acc838f6f83cb2d585fdbc7f4;p=civicrm-core.git

Merge pull request #6600 from colemanw/CRM-17038

CRM-17038 - Fix custom tokens in greetings
---

fb94073178aaa14acc838f6f83cb2d585fdbc7f4