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)
commit709650a014af4d97ce3b923f4f28d3957cf8ed49
tree338e991ba27b1b57ed52faadbd4d6c0988c7a59c
parent88af9a950f680fd4b8846b5cadee2db23573694b
parentd48ad2c0f9c6463877aeb81651b157430e4c8ced
Merge pull request #8445 from eileenmcnaughton/merge_rc

CRM-18673 fix merge handling of identifal addresses