From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri, 11 Sep 2015 07:10:23 +0000 (+1200)
Subject: Merge pull request #6724 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ef867d83b5609ca9dff1ec6203b53c6b6f7bb638;p=civicrm-core.git

Merge pull request #6724 from eileenmcnaughton/master

Test fixes
---

ef867d83b5609ca9dff1ec6203b53c6b6f7bb638