Merge branch '1.0' of git.carlh.net:git/libsub into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 18 Dec 2015 14:51:49 +0000 (14:51 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 18 Dec 2015 14:51:49 +0000 (14:51 +0000)

Trivial merge