From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 3 Nov 2015 22:56:19 +0000 (-0800)
Subject: Merge pull request #7117 from eileenmcnaughton/CRM-17490
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dff9cf2f2da7d8bc49091e757b1f97809a4f6bd4;p=civicrm-core.git

Merge pull request #7117 from eileenmcnaughton/CRM-17490

CRM-17490 fix interface error on activity import
---

dff9cf2f2da7d8bc49091e757b1f97809a4f6bd4