From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon, 2 Feb 2015 04:13:56 +0000 (+1300)
Subject: Merge pull request #5056 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bb16905ccc9d36fcd0ae785e78d6750e44e3745f;p=civicrm-core.git

Merge pull request #5056 from eileenmcnaughton/master

Master
---

bb16905ccc9d36fcd0ae785e78d6750e44e3745f