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)
commit0f02068c297fd131b7e38c80fd856f4058d8b80c
treedc5ba5eeac09e32256c214ffe86aab380a50730f
parent7e29aab02d1bb6dbb82a52c9a5e489f5b6f2611e
parentf4bbf7bd9db49ec03719a1d3b1d5346a40a8f23a
Merge pull request #5917 from eileenmcnaughton/master

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