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

Merge pull request #3422 from eileenmcnaughton/test_fixes

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

c926b0573a288ebc42bafd993deb90e232a79b3e