Merge pull request #3410 from eileenmcnaughton/testfixes_and_tidy_ups
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 10:46:46 +0000 (22:46 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 10:46:46 +0000 (22:46 +1200)
test fix - combat caching on mail_settings


Trivial merge