From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu, 28 May 2015 07:30:22 +0000 (+1200)
Subject: Merge pull request #5917 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0f02068c297fd131b7e38c80fd856f4058d8b80c;p=civicrm-core.git

Merge pull request #5917 from eileenmcnaughton/master

CRM-16555 add missing path fix from previous PR & phpcs tidyups
---

0f02068c297fd131b7e38c80fd856f4058d8b80c