From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon, 27 Jul 2015 23:17:36 +0000 (+1200)
Subject: Merge pull request #6312 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9fc166d0859b59ef6d95da7fe485d1749e12d511;p=civicrm-core.git

Merge pull request #6312 from eileenmcnaughton/master

Master
---

9fc166d0859b59ef6d95da7fe485d1749e12d511