Merge branch 'cth' of ssh://git.carlh.net/home/carl/git/asdcplib-cth into cth
authorCarl Hetherington <cth@carlh.net>
Thu, 9 Jun 2016 19:24:24 +0000 (20:24 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 9 Jun 2016 19:24:24 +0000 (20:24 +0100)

Trivial merge