From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed, 24 Sep 2014 07:00:57 +0000 (+1200)
Subject: Merge pull request #4219 from eileenmcnaughton/4.5
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=66181791dc143b5bd9da46e82016205206dfcece;p=civicrm-core.git

Merge pull request #4219 from eileenmcnaughton/4.5

merge changes from 4.4
---

66181791dc143b5bd9da46e82016205206dfcece