From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sat, 24 Oct 2015 05:19:43 +0000 (+1300)
Subject: Merge pull request #7046 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5334a30fc2d28b33b74e14cdea76fa147ca926d4;p=civicrm-core.git

Merge pull request #7046 from eileenmcnaughton/master

Master
---

5334a30fc2d28b33b74e14cdea76fa147ca926d4