Merge pull request #3503 from eileenmcnaughton/CRM-14866
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 16 Jun 2014 22:47:59 +0000 (10:47 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 16 Jun 2014 22:47:59 +0000 (10:47 +1200)
test fix - set globals in main setup function rather than ad hoc


Trivial merge