From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed, 29 Oct 2014 05:06:48 +0000 (+1300)
Subject: Merge pull request #4466 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=03b052681a4b87be594cd93ddb3e44cfc51af17f;p=civicrm-core.git

Merge pull request #4466 from eileenmcnaughton/master

Master
---

03b052681a4b87be594cd93ddb3e44cfc51af17f