Merge pull request #8902 from seamuslee001/CRM-19068-core-tidy-46
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 18 Aug 2016 19:52:15 +0000 (07:52 +1200)
committerGitHub <noreply@github.com>
Thu, 18 Aug 2016 19:52:15 +0000 (07:52 +1200)
CRM-19068 port Franky's code style fix


Trivial merge