Merge branch 'master' of git.carlh.net:git/cdist
authorCarl Hetherington <cth@carlh.net>
Sat, 10 Oct 2015 11:58:08 +0000 (12:58 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 10 Oct 2015 11:58:08 +0000 (12:58 +0100)

Trivial merge