Merge branch 'docker2' of git.carlh.net:git/cdist into docker2
-rw-r--r-- 12 .gitignore
-rwxr-xr-x 35070 cdist