Merge pull request #3420 from eileenmcnaughton/test_fixes
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 21:31:05 +0000 (09:31 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 21:31:05 +0000 (09:31 +1200)
Fix & test mail setting caching to fix test


Trivial merge