Merge branch 'cth' of ssh://git.carlh.net/home/carl/git/asdcplib-cth into cth
authorCarl Hetherington <cth@carlh.net>
Wed, 3 Feb 2016 12:11:20 +0000 (12:11 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 3 Feb 2016 12:11:20 +0000 (12:11 +0000)

Trivial merge