civicrm/civicrm-core — pull request #4409 by davecivicrm (2014-10-20 19:20:32+00:00)
Title: CRM-15418 - Prevent non-contact tokens from being lost in replaceGreetin...

...gTokens function.

----------------------------------------
* CRM-15418:
https://issues.civicrm.org/jira/browse/CRM-15418