civicrm/civicrm-core — pull request #2987 by kurund (2014-04-28 18:59:59+00:00)
Title: fatal error fixes due to bad merge CRM-14276

----------------------------------------
* CRM-14276: Hook for display name
https://issues.civicrm.org/jira/browse/CRM-14276