civicrm/civicrm-core — pull request #1711 by colemanw (2013-09-29 22:03:45+00:00)
Title: CRM-13161 change token names back to the familiar old ones

----------------------------------------
* CRM-13161: Greetings are not evaluated correctly if it includes prefix / suffix
http://issues.civicrm.org/jira/browse/CRM-13161