Merge pull request #8445 from eileenmcnaughton/merge_rc
authorTim Otten <totten@civicrm.org>
Thu, 26 May 2016 23:38:00 +0000 (16:38 -0700)
committerTim Otten <totten@civicrm.org>
Thu, 26 May 2016 23:38:00 +0000 (16:38 -0700)
CRM-18673 fix merge handling of identifal addresses


Trivial merge