Merge.
authorCarl Hetherington <cth@carlh.net>
Sat, 3 Oct 2015 18:20:54 +0000 (19:20 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 3 Oct 2015 18:20:54 +0000 (19:20 +0100)
commit724c0ff1d3b4d1d0b3aff70a3de3ec980edba741
treed90e7db849f4a55b7568a946de85de9f4ff81209
parentd7eea18442f357b37fd7b4ce02551163aaa76419
parentcd583bd9f570a088d78a010b16beb7bcaccf00a4
Merge.
vmbuild