Merge pull request #5917 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 28 May 2015 07:30:22 +0000 (19:30 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Thu, 28 May 2015 07:30:22 +0000 (19:30 +1200)
CRM-16555 add missing path fix from previous PR & phpcs tidyups


Trivial merge