Merge pull request #4009 from eileenmcnaughton/CRM-15210
authorcolemanw <coleman@civicrm.org>
Mon, 1 Sep 2014 15:49:14 +0000 (16:49 +0100)
committercolemanw <coleman@civicrm.org>
Mon, 1 Sep 2014 15:49:14 +0000 (16:49 +0100)
commit52ffede133c22ceff90d76d5585626c2d9f36175
treef14cd6be64dd644ef87f4b28289e5ce77aed1f61
parent9d44411d49ca5bea0972d0ff1c105657ff900d44
parent29990b77ab3bfc84c75faf0f39640141536a7818
Merge pull request #4009 from eileenmcnaughton/CRM-15210

CRM-15210 fix fatal on merge exports of non primary addresses