Merge pull request #3674 from eileenmcnaughton/test-fix
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 15 Jul 2014 22:41:09 +0000 (10:41 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 15 Jul 2014 22:41:09 +0000 (10:41 +1200)
commitc781ed4f4d876dce9e31381a0e3c3b6bf1777486
tree9502d696e996ddc4c042d39944fd811095c7e438
parentf2fdb1887151740f55cac06e584ca00b2b407ed6
parentc66842140e1fd52cf03300debaca5041a1a92168
Merge pull request #3674 from eileenmcnaughton/test-fix

Test fix