Merge pull request #3422 from eileenmcnaughton/test_fixes
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 22:43:05 +0000 (10:43 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 22:43:05 +0000 (10:43 +1200)
commitc926b0573a288ebc42bafd993deb90e232a79b3e
treeceb76bd6aff175d47cc45dcdb21d99bb58c2a8db
parentca89813ddf8e48e5d57ec67f1f3207265537be9e
parente123fef41e664c1d75e91b9434a9d53f7f388cff
Merge pull request #3422 from eileenmcnaughton/test_fixes

Test fixes & a few minor tidy ups, fix mail_settings in particular