Merge branch 'test-fixes'
authorCarl Hetherington <cth@carlh.net>
Thu, 27 Jun 2013 18:03:45 +0000 (19:03 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 27 Jun 2013 18:03:45 +0000 (19:03 +0100)
commit3d48669c9cba480cf83775cafd2a66033007c030
tree1f5580d0d6a85623f2a722bb4a123e162b881ee8
parent4833c6d5dd49ecd768af5edad81823baa9c094ab
parenta0498a6e13647d181153693b1f2c75cb00de92f4
Merge branch 'test-fixes'