civicrm/civicrm-core — pull request #2611 by davecivicrm (2014-03-05 00:33:14+00:00)
Title: CRM-13981 - Remove reference to obsolete column honor_contact_id in Merg...

...er.php which was causing fatal error on merge. Remove Honoree.tpl which is no longer used.

----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
http://issues.civicrm.org/jira/browse/CRM-13981