From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 27 Jan 2015 07:40:47 +0000 (+1300)
Subject: Merge pull request #5011 from eileenmcnaughton/rebase2
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=756a0fbaf0cc622ad8472d7785f53684d05e75e7;p=civicrm-core.git

Merge pull request #5011 from eileenmcnaughton/rebase2

additional test and test tidy-ups
---

756a0fbaf0cc622ad8472d7785f53684d05e75e7