Nico Schottelius 9a3d9334d5 Merge branch 'master' into install ... Conflicts: bin/cdist-config Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>		2011-09-19 15:05:39 +02:00
..
cdist-config.text
cdist-deploy-stdin-to.text
cdist-env.text
cdist-quickstart.text
cdist-type-emulator.text
cdist.text