Merge pull request #7117 from eileenmcnaughton/CRM-17490
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Nov 2015 22:56:19 +0000 (14:56 -0800)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Nov 2015 22:56:19 +0000 (14:56 -0800)
CRM-17490 fix interface error on activity import


Trivial merge