Merge pull request #7881 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 29 Feb 2016 04:38:14 +0000 (17:38 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 29 Feb 2016 04:38:14 +0000 (17:38 +1300)
commit5284c324c3662a248f6811d4abdf792019360a42
treebd271b709f55dd054f9d45f4a1300e0319b86a02
parent3457a64b05d640db7935152520281692d1256022
parent1ca22999177500b37a4a15ae1223615b5abb8d96
Merge pull request #7881 from eileenmcnaughton/master

Test fixes, tests were failing when run in isolation due to inconsist…