Merge branch 'cth' of ssh://git.carlh.net/home/carl/git/asdcplib-cth into cth
authorCarl Hetherington <cth@carlh.net>
Mon, 8 Feb 2016 16:57:19 +0000 (16:57 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 8 Feb 2016 16:57:19 +0000 (16:57 +0000)

Trivial merge