Merge pull request #6509 from eileenmcnaughton/test-fixes
authorEileen McNaughton <eileen@mcnaughty.com>
Sat, 15 Aug 2015 22:35:46 +0000 (10:35 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Sat, 15 Aug 2015 22:35:46 +0000 (10:35 +1200)
commitbbf47dea6566cbfe2fb974bc720cdaa0a6dddec2
tree4b8efb0aba67b60c7084d56e79aae2c09d02b867
parent35dabaefc39d4e0938a8fd78698f612059b2d839
parent8ccce14a8610e15e2507d4ba099bbdb62985149d
Merge pull request #6509 from eileenmcnaughton/test-fixes

Test fixes