From: colemanw <coleman@civicrm.org>
Date: Mon, 1 Sep 2014 15:49:14 +0000 (+0100)
Subject: Merge pull request #4009 from eileenmcnaughton/CRM-15210
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=52ffede133c22ceff90d76d5585626c2d9f36175;p=civicrm-core.git

Merge pull request #4009 from eileenmcnaughton/CRM-15210

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

52ffede133c22ceff90d76d5585626c2d9f36175