civicrm/civicrm-core — pull request #4183 by totten (2014-09-19 16:37:33+00:00)
Title: CRM-15333 - Fix multiple-merges of hook-results

This is a resubmission of https://github.com/civicrm/civicrm-core/pull/4166
which targets v4.5 and adds a unit-test.