From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 3 Jun 2014 10:46:46 +0000 (+1200)
Subject: Merge pull request #3410 from eileenmcnaughton/testfixes_and_tidy_ups
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e4a891eeaf0ee9d938084bafd0216e09b2c8678f;p=civicrm-core.git

Merge pull request #3410 from eileenmcnaughton/testfixes_and_tidy_ups

test fix - combat caching on mail_settings
---

e4a891eeaf0ee9d938084bafd0216e09b2c8678f