Merge branch '1.0' of git.carlh.net:git/libsub into 1.0
authorCarl Hetherington <cth@carlh.net>
Sat, 16 Jan 2016 15:59:04 +0000 (15:59 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 16 Jan 2016 15:59:04 +0000 (15:59 +0000)

Trivial merge