From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 27 Jan 2015 01:44:27 +0000 (+1300)
Subject: Merge pull request #5008 from eileenmcnaughton/rebase
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=308a06f6f523d09e192430d6d936a584191f4fa6;p=civicrm-core.git

Merge pull request #5008 from eileenmcnaughton/rebase

Rebase of some of the tidyups from other PR
---

308a06f6f523d09e192430d6d936a584191f4fa6