Merge pull request #6382 from eileenmcnaughton/CRM-16923-tests
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 3 Aug 2015 00:45:28 +0000 (12:45 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 3 Aug 2015 00:45:28 +0000 (12:45 +1200)
CRM-16923 follow up test fixes


Trivial merge