Merge pull request #4409 from davecivicrm/CRM-15418
authorDave Greenberg <dave@civicrm.org>
Mon, 20 Oct 2014 20:38:18 +0000 (13:38 -0700)
committerDave Greenberg <dave@civicrm.org>
Mon, 20 Oct 2014 20:38:18 +0000 (13:38 -0700)
commit4bb86d58a0614c9595d4be8f1a0dd6a775d8985d
tree484c66c3cdc123a24a11bba59c49449327967462
parentae7110b369b9c0c9cc7accbb2f5e3aca7dfade88
parent562cf4d73cc403d502eaa84af455b9757be9ab3c
Merge pull request #4409 from davecivicrm/CRM-15418

CRM-15418 - Prevent non-contact tokens from being lost in replaceGreetin...