From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri, 11 Dec 2015 02:14:12 +0000 (+1300)
Subject: Merge pull request #7000 from eileenmcnaughton/CRM-17275-import
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d64d708826404977d57c734e2bb4fdb14fa2e186;p=civicrm-core.git

Merge pull request #7000 from eileenmcnaughton/CRM-17275-import

Crm 17275 import
---

d64d708826404977d57c734e2bb4fdb14fa2e186