Merge pull request #6082 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 25 Jun 2015 01:38:51 +0000 (13:38 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Thu, 25 Jun 2015 01:38:51 +0000 (13:38 +1200)
Code tidyups towards test fix & CRM-16402


Trivial merge