From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu, 25 Jun 2015 01:38:51 +0000 (+1200)
Subject: Merge pull request #6082 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e89336f7ce71780ebc25f748ad63f4d275491de5;p=civicrm-core.git

Merge pull request #6082 from eileenmcnaughton/master

Code tidyups towards test fix & CRM-16402
---

e89336f7ce71780ebc25f748ad63f4d275491de5