From: Tim Otten <totten@civicrm.org>
Date: Thu, 26 May 2016 23:38:00 +0000 (-0700)
Subject: Merge pull request #8445 from eileenmcnaughton/merge_rc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=709650a014af4d97ce3b923f4f28d3957cf8ed49;p=civicrm-core.git

Merge pull request #8445 from eileenmcnaughton/merge_rc

CRM-18673 fix merge handling of identifal addresses
---

709650a014af4d97ce3b923f4f28d3957cf8ed49