Merge branch '1.0' of git.carlh.net:git/libsub into 1.0
authorCarl Hetherington <cth@carlh.net>
Sat, 13 Jun 2015 14:45:11 +0000 (15:45 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 13 Jun 2015 14:45:11 +0000 (15:45 +0100)

Trivial merge