Merge branch 'docker2' of git.carlh.net:git/cdist into docker2
authorCarl Hetherington <cth@carlh.net>
Sat, 5 Aug 2017 22:56:08 +0000 (23:56 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 5 Aug 2017 22:56:08 +0000 (23:56 +0100)
1  2 
cdist

diff --cc cdist
Simple merge