Merge pull request #6724 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Fri, 11 Sep 2015 07:10:23 +0000 (19:10 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Fri, 11 Sep 2015 07:10:23 +0000 (19:10 +1200)
commitef867d83b5609ca9dff1ec6203b53c6b6f7bb638
tree8251e4868e63b6ae98d02d2af4c50d61a1a6ae66
parentb59f68f08d7d428cb3622cfdf94b526c4d515928
parenta160bb08153122ed40338b62aa68cc5abc25132f
Merge pull request #6724 from eileenmcnaughton/master

Test fixes