From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon, 13 Jul 2015 08:53:26 +0000 (+1200)
Subject: Merge pull request #6201 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=715f07a9162c571f9a1bed71a1bcafaaf9133f9e;p=civicrm-core.git

Merge pull request #6201 from eileenmcnaughton/master

test fix
---

715f07a9162c571f9a1bed71a1bcafaaf9133f9e