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)
CRM-15210 fix fatal on merge exports of non primary addresses


Trivial merge